diff options
| -rw-r--r-- | client/pool-buffer.c | 2 | ||||
| -rw-r--r-- | common/background-image.c | 2 | ||||
| -rw-r--r-- | common/cairo.c | 4 | ||||
| -rw-r--r-- | common/pango.c | 4 | ||||
| -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 | ||||
| -rw-r--r-- | sway/config.c | 2 | ||||
| -rw-r--r-- | sway/tree/container.c | 2 | ||||
| -rw-r--r-- | swaybar/render.c | 2 | ||||
| -rw-r--r-- | swaybar/tray/item.c | 2 | ||||
| -rw-r--r-- | swaynag/render.c | 2 |
13 files changed, 17 insertions, 17 deletions
diff --git a/client/pool-buffer.c b/client/pool-buffer.c index fd500c49..ea31edd3 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c @@ -1,6 +1,6 @@ #define _POSIX_C_SOURCE 200809 #include <assert.h> -#include <cairo/cairo.h> +#include <cairo.h> #include <fcntl.h> #include <pango/pangocairo.h> #include <stdio.h> 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" 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> 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 @@ #include "sway/tree/arrange.h" #include "sway/tree/root.h" #include "sway/tree/workspace.h" -#include "cairo.h" +#include "cairo_util.h" #include "pango.h" #include "stringop.h" #include "list.h" diff --git a/sway/tree/container.c b/sway/tree/container.c index bec17d95..b928d069 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -7,7 +7,7 @@ #include <strings.h> #include <wayland-server-core.h> #include <wlr/types/wlr_output_layout.h> -#include "cairo.h" +#include "cairo_util.h" #include "pango.h" #include "sway/config.h" #include "sway/desktop.h" diff --git a/swaybar/render.c b/swaybar/render.c index ebe127a5..fcc8be1d 100644 --- a/swaybar/render.c +++ b/swaybar/render.c @@ -5,7 +5,7 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> -#include "cairo.h" +#include "cairo_util.h" #include "pango.h" #include "pool-buffer.h" #include "swaybar/bar.h" diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index c9da51d4..19f4beac 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c @@ -13,7 +13,7 @@ #include "swaybar/tray/item.h" #include "swaybar/tray/tray.h" #include "background-image.h" -#include "cairo.h" +#include "cairo_util.h" #include "list.h" #include "log.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h" diff --git a/swaynag/render.c b/swaynag/render.c index cf2cc9e0..2a7f869a 100644 --- a/swaynag/render.c +++ b/swaynag/render.c @@ -1,5 +1,5 @@ #include <stdint.h> -#include "cairo.h" +#include "cairo_util.h" #include "log.h" #include "pango.h" #include "pool-buffer.h" |