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 /include | |
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 'include')
-rw-r--r-- | include/background-image.h | 2 | ||||
-rw-r--r-- | include/cairo_util.h (renamed from include/cairo.h) | 6 | ||||
-rw-r--r-- | include/pango.h | 2 | ||||
-rw-r--r-- | include/pool-buffer.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/background-image.h b/include/background-image.h index 15935ffd..a97ef375 100644 --- a/include/background-image.h +++ b/include/background-image.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef _SWAY_BACKGROUND_IMAGE_H | 1 | #ifndef _SWAY_BACKGROUND_IMAGE_H |
2 | #define _SWAY_BACKGROUND_IMAGE_H | 2 | #define _SWAY_BACKGROUND_IMAGE_H |
3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
4 | 4 | ||
5 | enum background_mode { | 5 | enum background_mode { |
6 | BACKGROUND_MODE_STRETCH, | 6 | BACKGROUND_MODE_STRETCH, |
diff --git a/include/cairo.h b/include/cairo_util.h index c1275db2..dc049c6d 100644 --- a/include/cairo.h +++ b/include/cairo_util.h | |||
@@ -1,8 +1,8 @@ | |||
1 | #ifndef _SWAY_CAIRO_H | 1 | #ifndef _SWAY_CAIRO_UTIL_H |
2 | #define _SWAY_CAIRO_H | 2 | #define _SWAY_CAIRO_UTIL_H |
3 | #include "config.h" | 3 | #include "config.h" |
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include <cairo/cairo.h> | 5 | #include <cairo.h> |
6 | #include <wayland-client-protocol.h> | 6 | #include <wayland-client-protocol.h> |
7 | 7 | ||
8 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color); | 8 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color); |
diff --git a/include/pango.h b/include/pango.h index 6ab83c16..75dbba27 100644 --- a/include/pango.h +++ b/include/pango.h | |||
@@ -3,7 +3,7 @@ | |||
3 | #include <stdarg.h> | 3 | #include <stdarg.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
5 | #include <stdint.h> | 5 | #include <stdint.h> |
6 | #include <cairo/cairo.h> | 6 | #include <cairo.h> |
7 | #include <pango/pangocairo.h> | 7 | #include <pango/pangocairo.h> |
8 | 8 | ||
9 | /** | 9 | /** |
diff --git a/include/pool-buffer.h b/include/pool-buffer.h index 54f5be06..b7a95afe 100644 --- a/include/pool-buffer.h +++ b/include/pool-buffer.h | |||
@@ -1,6 +1,6 @@ | |||
1 | #ifndef _SWAY_BUFFERS_H | 1 | #ifndef _SWAY_BUFFERS_H |
2 | #define _SWAY_BUFFERS_H | 2 | #define _SWAY_BUFFERS_H |
3 | #include <cairo/cairo.h> | 3 | #include <cairo.h> |
4 | #include <pango/pangocairo.h> | 4 | #include <pango/pangocairo.h> |
5 | #include <stdbool.h> | 5 | #include <stdbool.h> |
6 | #include <stdint.h> | 6 | #include <stdint.h> |