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.

9 files changed, 13 insertions, 13 deletions

diff --git a/include/backend/x11.h b/include/backend/x11.h
index 37e3e4b6..06803768 100644
--- a/include/backend/x11.h
+++ b/include/backend/x11.h
@@ -64,7 +64,7 @@ struct wlr_x11_backend {
 	// A blank cursor
 	xcb_cursor_t cursor;
 
-#ifdef WLR_HAS_XCB_XKB
+#if WLR_HAS_XCB_XKB
 	bool xkb_supported;
 	uint8_t xkb_base_event;
 	uint8_t xkb_base_error;
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
 	};
diff --git a/include/wlr/backend/meson.build b/include/wlr/backend/meson.build
index e005b854..3d6f0e40 100644
--- a/include/wlr/backend/meson.build
+++ b/include/wlr/backend/meson.build
@@ -9,7 +9,7 @@ install_headers(
 	subdir: 'wlr/backend',
 )
 
-if conf_data.get('WLR_HAS_X11_BACKEND', false)
+if conf_data.get('WLR_HAS_X11_BACKEND', 0) == 1
 	install_headers('x11.h', subdir: 'wlr/backend')
 endif
 
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
index 43b5aec9..8874dbc7 100644
--- a/include/wlr/meson.build
+++ b/include/wlr/meson.build
@@ -15,7 +15,7 @@ install_headers(
 	'xcursor.h',
 	subdir: 'wlr'
 )
-if conf_data.get('WLR_HAS_XWAYLAND', false)
+if conf_data.get('WLR_HAS_XWAYLAND', 0) == 1
 	install_headers('xwayland.h', subdir: 'wlr')
 endif
 
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 9ba2996a..fedb6fdd 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index 9500bced..a7f97a89 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -11,7 +11,7 @@
 
 #include <wlr/config.h>
 
-#if !(defined(WLR_HAS_X11_BACKEND) || defined(WLR_HAS_WAYLAND))
+#if !WLR_HAS_X11_BACKEND && !WLR_HAS_XWAYLAND
 #define MESA_EGL_NO_X11_HEADERS
 #endif
 
diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h
index dc40cc3e..c1be572b 100644
--- a/include/xwayland/xwm.h
+++ b/include/xwayland/xwm.h
@@ -5,10 +5,10 @@
 #include <wlr/config.h>
 #include <wlr/xwayland.h>
 #include <xcb/render.h>
-#ifdef WLR_HAS_XCB_ICCCM
+#if WLR_HAS_XCB_ICCCM
 #include <xcb/xcb_icccm.h>
 #endif
-#ifdef WLR_HAS_XCB_ERRORS
+#if WLR_HAS_XCB_ERRORS
 #include <xcb/xcb_errors.h>
 #endif
 #include "xwayland/selection.h"
@@ -122,7 +122,7 @@ struct wlr_xwm {
 	struct wlr_xwayland_surface *drag_focus;
 
 	const xcb_query_extension_reply_t *xfixes;
-#ifdef WLR_HAS_XCB_ERRORS
+#if WLR_HAS_XCB_ERRORS
 	xcb_errors_context_t *errors_context;
 #endif