From f95cb9a7c17251c43b1d1058092e0a15d1fe8dd9 Mon Sep 17 00:00:00 2001
From: Pascal Pascher <pascalpascher@gmx.net>
Date: Wed, 25 Jul 2018 13:32:20 +0200
Subject: reverted includes of "sway/config.h" and replaced with "config.h"
 from meson build

---
 sway/commands/swap.c  | 2 +-
 sway/desktop/output.c | 1 +
 sway/desktop/render.c | 1 +
 sway/input/cursor.c   | 2 +-
 sway/input/seat.c     | 2 +-
 sway/server.c         | 1 +
 sway/tree/layout.c    | 2 +-
 sway/tree/view.c      | 2 +-
 8 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'sway')

diff --git a/sway/commands/swap.c b/sway/commands/swap.c
index 8b8e9d79..4e3a9cce 100644
--- a/sway/commands/swap.c
+++ b/sway/commands/swap.c
@@ -1,6 +1,6 @@
 #include <strings.h>
 #include <wlr/util/log.h>
-#include "sway/config.h"
+#include "config.h"
 #include "sway/commands.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/layout.h"
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 05daad7b..1512408e 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -14,6 +14,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/region.h>
 #include "log.h"
+#include "config.h"
 #include "sway/config.h"
 #include "sway/input/input-manager.h"
 #include "sway/input/seat.h"
diff --git a/sway/desktop/render.c b/sway/desktop/render.c
index 2e6b6649..3e7bd94b 100644
--- a/sway/desktop/render.c
+++ b/sway/desktop/render.c
@@ -14,6 +14,7 @@
 #include <wlr/types/wlr_surface.h>
 #include <wlr/util/region.h>
 #include "log.h"
+#include "config.h"
 #include "sway/config.h"
 #include "sway/debug.h"
 #include "sway/input/input-manager.h"
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 3de36e1c..2468a341 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -11,7 +11,7 @@
 #include <wlr/types/wlr_idle.h>
 #include "list.h"
 #include "log.h"
-#include "sway/config.h"
+#include "config.h"
 #include "sway/desktop.h"
 #include "sway/desktop/transaction.h"
 #include "sway/input/cursor.h"
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 2d62b101..cc0b16cf 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -12,7 +12,7 @@
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_xcursor_manager.h>
 #include "log.h"
-#include "sway/config.h"
+#include "config.h"
 #include "sway/debug.h"
 #include "sway/desktop.h"
 #include "sway/input/cursor.h"
diff --git a/sway/server.c b/sway/server.c
index 1521597f..10ca9614 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -25,6 +25,7 @@
 #include "sway/input/input-manager.h"
 #include "sway/server.h"
 #include "sway/tree/layout.h"
+#include "config.h"
 #ifdef HAVE_XWAYLAND
 #include "sway/xwayland.h"
 #endif
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 91f6accd..2b3263f8 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/config.h"
+#include "config.h"
 #include "sway/debug.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/container.h"
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 7cc15ae3..f672417e 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -3,12 +3,12 @@
 #include <wayland-server.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output_layout.h>
-#include "sway/config.h"
 #ifdef HAVE_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "list.h"
 #include "log.h"
+#include "config.h"
 #include "sway/criteria.h"
 #include "sway/commands.h"
 #include "sway/ipc-server.h"
-- 
cgit v1.2.3