From 57a09c8ca45e0ec023b7be88745b21fc71649c52 Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Tue, 26 Dec 2017 18:51:27 +0100
Subject: config: Put all defines into config.h

---
 rootston/config.c   | 1 +
 rootston/desktop.c  | 3 ++-
 rootston/main.c     | 3 ++-
 rootston/seat.c     | 1 +
 rootston/xwayland.c | 3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'rootston')

diff --git a/rootston/config.c b/rootston/config.c
index dd741186..f369c4f5 100644
--- a/rootston/config.c
+++ b/rootston/config.c
@@ -9,6 +9,7 @@
 #include <strings.h>
 #include <unistd.h>
 #include <sys/param.h>
+#include "config.h"
 #include <wlr/util/log.h>
 #include <wlr/types/wlr_box.h>
 #include "rootston/config.h"
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 1431dc5d..a4692439 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -3,6 +3,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <math.h>
+#include "config.h"
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_cursor.h>
@@ -440,7 +441,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 		&desktop->wl_shell_surface);
 	desktop->wl_shell_surface.notify = handle_wl_shell_surface;
 
-#ifdef HAS_XWAYLAND
+#ifdef WLR_HAS_XWAYLAND
 	if (config->xwayland) {
 		desktop->xwayland = wlr_xwayland_create(server->wl_display,
 			desktop->compositor);
diff --git a/rootston/main.c b/rootston/main.c
index 161824d6..87f1c0b4 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <wayland-server.h>
+#include "config.h"
 #include <wlr/backend.h>
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
@@ -64,7 +65,7 @@ int main(int argc, char **argv) {
 	}
 
 	setenv("WAYLAND_DISPLAY", socket, true);
-#ifndef HAS_XWAYLAND
+#ifndef WLR_HAS_XWAYLAND
 	ready(NULL, NULL);
 #else
 	if (server.desktop->xwayland != NULL) {
diff --git a/rootston/seat.c b/rootston/seat.c
index ce0f1374..635bc8b1 100644
--- a/rootston/seat.c
+++ b/rootston/seat.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <wayland-server.h>
+#include "config.h"
 #include <wlr/types/wlr_xcursor_manager.h>
 #include <wlr/util/log.h>
 #include "rootston/xcursor.h"
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 5f677116..b00b61bc 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -2,11 +2,12 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <wayland-server.h>
+#include "config.h"
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_surface.h>
 #include <wlr/xwayland.h>
 #include <wlr/util/log.h>
-#include "rootston/desktop.h"
+#include "rootston/server.h"
 #include "rootston/server.h"
 
 static void activate(struct roots_view *view, bool active) {
-- 
cgit v1.2.3