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 /sway | |
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 'sway')
-rw-r--r-- | sway/config.c | 2 | ||||
-rw-r--r-- | sway/tree/container.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c index 76b9ec08..39013865 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "sway/tree/arrange.h" | 26 | #include "sway/tree/arrange.h" |
27 | #include "sway/tree/root.h" | 27 | #include "sway/tree/root.h" |
28 | #include "sway/tree/workspace.h" | 28 | #include "sway/tree/workspace.h" |
29 | #include "cairo.h" | 29 | #include "cairo_util.h" |
30 | #include "pango.h" | 30 | #include "pango.h" |
31 | #include "stringop.h" | 31 | #include "stringop.h" |
32 | #include "list.h" | 32 | #include "list.h" |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 8ca6a50d..2b51a723 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <strings.h> | 7 | #include <strings.h> |
8 | #include <wayland-server-core.h> | 8 | #include <wayland-server-core.h> |
9 | #include <wlr/types/wlr_output_layout.h> | 9 | #include <wlr/types/wlr_output_layout.h> |
10 | #include "cairo.h" | 10 | #include "cairo_util.h" |
11 | #include "pango.h" | 11 | #include "pango.h" |
12 | #include "sway/config.h" | 12 | #include "sway/config.h" |
13 | #include "sway/desktop.h" | 13 | #include "sway/desktop.h" |