From 51bfdd620e70c41e1a9fb4ce7831eddfb1bf893b Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Mon, 12 Nov 2018 10:12:46 +0100
Subject: Use #if instead of #ifdef for wlroots config data

This prevents some annoying issues when e.g. not including wlr/config.h or
making a typo in the guard name.
---
 include/rootston/desktop.h | 2 +-
 include/rootston/server.h  | 2 +-
 include/rootston/view.h    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'include/rootston')

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 345c9c09..4ce92e2b 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -76,7 +76,7 @@ struct roots_desktop {
 	struct wl_listener virtual_keyboard_new;
 	struct wl_listener pointer_constraint;
 
-#ifdef WLR_HAS_XWAYLAND
+#if WLR_HAS_XWAYLAND
 	struct wlr_xwayland *xwayland;
 	struct wl_listener xwayland_surface;
 #endif
diff --git a/include/rootston/server.h b/include/rootston/server.h
index 7ab15682..1836a374 100644
--- a/include/rootston/server.h
+++ b/include/rootston/server.h
@@ -7,7 +7,7 @@
 #include <wlr/config.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_data_device.h>
-#ifdef WLR_HAS_XWAYLAND
+#if WLR_HAS_XWAYLAND
 #include <wlr/xwayland.h>
 #endif
 #include "rootston/config.h"
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 14448fc6..0c75737b 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -79,7 +79,7 @@ enum roots_view_type {
 	ROOTS_WL_SHELL_VIEW,
 	ROOTS_XDG_SHELL_V6_VIEW,
 	ROOTS_XDG_SHELL_VIEW,
-#ifdef WLR_HAS_XWAYLAND
+#if WLR_HAS_XWAYLAND
 	ROOTS_XWAYLAND_VIEW,
 #endif
 };
@@ -117,7 +117,7 @@ struct roots_view {
 		struct wlr_wl_shell_surface *wl_shell_surface;
 		struct wlr_xdg_surface_v6 *xdg_surface_v6;
 		struct wlr_xdg_surface *xdg_surface;
-#ifdef WLR_HAS_XWAYLAND
+#if WLR_HAS_XWAYLAND
 		struct wlr_xwayland_surface *xwayland_surface;
 #endif
 	};
@@ -125,7 +125,7 @@ struct roots_view {
 		struct roots_wl_shell_surface *roots_wl_shell_surface;
 		struct roots_xdg_surface_v6 *roots_xdg_surface_v6;
 		struct roots_xdg_surface *roots_xdg_surface;
-#ifdef WLR_HAS_XWAYLAND
+#if WLR_HAS_XWAYLAND
 		struct roots_xwayland_surface *roots_xwayland_surface;
 #endif
 	};
-- 
cgit v1.2.3