diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2021-05-07 16:57:51 -0400 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2021-05-07 16:57:51 -0400 |
| commit | 25a8d153467fe83d5f5968f017115c4424536dc5 (patch) | |
| tree | 1b8fd8874d3612a2cac1931fb8f55fdc89c1b1e8 /common | |
| parent | 5e86a0d6b894ac5df57d566d88a358102969cba8 (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.
(cherry picked from commit d45623c2db570b7a2e0582943734d18f3d64b126)
Diffstat (limited to 'common')
| -rw-r--r-- | common/background-image.c | 2 | ||||
| -rw-r--r-- | common/cairo.c | 4 | ||||
| -rw-r--r-- | common/pango.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/background-image.c b/common/background-image.c index de42e8e9..994a0805 100644 --- a/common/background-image.c +++ b/common/background-image.c @@ -1,6 +1,6 @@ #include <assert.h> #include "background-image.h" -#include "cairo.h" +#include "cairo_util.h" #include "log.h" #if HAVE_GDK_PIXBUF #include <gdk-pixbuf/gdk-pixbuf.h> diff --git a/common/cairo.c b/common/cairo.c index 403dcf49..7c59d48c 100644 --- a/common/cairo.c +++ b/common/cairo.c @@ -1,6 +1,6 @@ #include <stdint.h> -#include <cairo/cairo.h> -#include "cairo.h" +#include <cairo.h> +#include "cairo_util.h" void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { cairo_set_source_rgba(cairo, 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 @@ -#include <cairo/cairo.h> +#include <cairo.h> #include <pango/pangocairo.h> #include <stdarg.h> #include <stdbool.h> @@ -6,7 +6,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include "cairo.h" +#include "cairo_util.h" #include "log.h" #include "stringop.h" |