diff options
| author |  Issam E. Maghni <issam.e.maghni@mailbox.org> | 2021-05-07 16:57:51 -0400 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2021-06-24 18:21:29 +0200 |
| commit | 2b0765b46498706b1b36efb6145949f9d0461e32 (patch) | |
| tree | 1b8fd8874d3612a2cac1931fb8f55fdc89c1b1e8 /common/pango.c | |
| parent | view: handle case where map_ws is NULL (diff) | |
| download | sway-2b0765b46498706b1b36efb6145949f9d0461e32.tar.gz sway-2b0765b46498706b1b36efb6145949f9d0461e32.tar.zst sway-2b0765b46498706b1b36efb6145949f9d0461e32.zip | |
cairo: Replace <cairo/cairo.h> by <cairo.h>
For full context, read
https://gitlab.freedesktop.org/cairo/cairo/-/issues/479
TL;DR, cairo’s pc file adds `/cairo` to CFLAGS.
So namespace cairo shouldn’t be used.
(cherry picked from commit d45623c2db570b7a2e0582943734d18f3d64b126)
Diffstat (limited to 'common/pango.c')
| -rw-r--r-- | common/pango.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/pango.c b/common/pango.c index fc3d0688..dbc369dc 100644 --- a/common/pango.c +++ b/common/pango.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include <cairo/cairo.h> | 1 | #include <cairo.h> |
| 2 | #include <pango/pangocairo.h> | 2 | #include <pango/pangocairo.h> |
| 3 | #include <stdarg.h> | 3 | #include <stdarg.h> |
| 4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
| @@ -6,7 +6,7 @@ | |||
| 6 | #include <stdio.h> | 6 | #include <stdio.h> |
| 7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
| 8 | #include <string.h> | 8 | #include <string.h> |
| 9 | #include "cairo.h" | 9 | #include "cairo_util.h" |
| 10 | #include "log.h" | 10 | #include "log.h" |
| 11 | #include "stringop.h" | 11 | #include "stringop.h" |
| 12 | 12 | ||