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-05-10 10:28:32 +0200 |
| commit | d45623c2db570b7a2e0582943734d18f3d64b126 (patch) | |
| tree | 6ecb1ad308bb31c00f71213207fe2a8725217d44 /include | |
| parent | 009c58fc9529e284569bf58b73964cb3dc7c5baf (diff) | |
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.
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 @@ #ifndef _SWAY_BACKGROUND_IMAGE_H #define _SWAY_BACKGROUND_IMAGE_H -#include "cairo.h" +#include "cairo_util.h" enum background_mode { 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 @@ -#ifndef _SWAY_CAIRO_H -#define _SWAY_CAIRO_H +#ifndef _SWAY_CAIRO_UTIL_H +#define _SWAY_CAIRO_UTIL_H #include "config.h" #include <stdint.h> -#include <cairo/cairo.h> +#include <cairo.h> #include <wayland-client-protocol.h> 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 @@ #include <stdarg.h> #include <stdbool.h> #include <stdint.h> -#include <cairo/cairo.h> +#include <cairo.h> #include <pango/pangocairo.h> /** 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 @@ #ifndef _SWAY_BUFFERS_H #define _SWAY_BUFFERS_H -#include <cairo/cairo.h> +#include <cairo.h> #include <pango/pangocairo.h> #include <stdbool.h> #include <stdint.h> |