From 2b0765b46498706b1b36efb6145949f9d0461e32 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Fri, 7 May 2021 16:57:51 -0400
Subject: cairo: Replace <cairo/cairo.h> by <cairo.h>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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)
---
 sway/config.c         | 2 +-
 sway/tree/container.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sway')

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 8ca6a50d..2b51a723 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"
-- 
cgit v1.2.3-54-g00ecf