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 /common | |
| parent | config.in: change terminal emulator to foot (diff) | |
| download | sway-d45623c2db570b7a2e0582943734d18f3d64b126.tar.gz sway-d45623c2db570b7a2e0582943734d18f3d64b126.tar.zst sway-d45623c2db570b7a2e0582943734d18f3d64b126.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.
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 @@ | |||
| 1 | #include <assert.h> | 1 | #include <assert.h> |
| 2 | #include "background-image.h" | 2 | #include "background-image.h" |
| 3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
| 4 | #include "log.h" | 4 | #include "log.h" |
| 5 | #if HAVE_GDK_PIXBUF | 5 | #if HAVE_GDK_PIXBUF |
| 6 | #include <gdk-pixbuf/gdk-pixbuf.h> | 6 | #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 @@ | |||
| 1 | #include <stdint.h> | 1 | #include <stdint.h> |
| 2 | #include <cairo/cairo.h> | 2 | #include <cairo.h> |
| 3 | #include "cairo.h" | 3 | #include "cairo_util.h" |
| 4 | 4 | ||
| 5 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { | 5 | void cairo_set_source_u32(cairo_t *cairo, uint32_t color) { |
| 6 | cairo_set_source_rgba(cairo, | 6 | 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 @@ | |||
| 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 | ||