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.
---
 backend/session/direct-ipc.c | 2 +-
 backend/session/logind.c     | 4 ++--
 backend/session/session.c    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'backend/session')

diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c
index 3abce46a..2b9634da 100644
--- a/backend/session/direct-ipc.c
+++ b/backend/session/direct-ipc.c
@@ -24,7 +24,7 @@
 
 enum { DRM_MAJOR = 226 };
 
-#ifdef WLR_HAS_LIBCAP
+#if WLR_HAS_LIBCAP
 #include <sys/capability.h>
 
 static bool have_permissions(void) {
diff --git a/backend/session/logind.c b/backend/session/logind.c
index b44112e6..bfe12190 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -15,10 +15,10 @@
 #include <wlr/util/log.h>
 #include "util/signal.h"
 
-#ifdef WLR_HAS_SYSTEMD
+#if WLR_HAS_SYSTEMD
 	#include <systemd/sd-bus.h>
 	#include <systemd/sd-login.h>
-#elif defined(WLR_HAS_ELOGIND)
+#elif WLR_HAS_ELOGIND
 	#include <elogind/sd-bus.h>
 	#include <elogind/sd-login.h>
 #endif
diff --git a/backend/session/session.c b/backend/session/session.c
index 041d8f83..96cde65c 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -19,7 +19,7 @@ extern const struct session_impl session_logind;
 extern const struct session_impl session_direct;
 
 static const struct session_impl *impls[] = {
-#if defined(WLR_HAS_SYSTEMD) || defined(WLR_HAS_ELOGIND)
+#if WLR_HAS_SYSTEMD || WLR_HAS_ELOGIND
 	&session_logind,
 #endif
 	&session_direct,
@@ -70,7 +70,7 @@ struct wlr_session *wlr_session_create(struct wl_display *disp) {
 	const char *env_wlr_session = getenv("WLR_SESSION");
 	if (env_wlr_session) {
 		if (!strcmp(env_wlr_session, "logind") || !strcmp(env_wlr_session, "systemd")) {
-		#if defined(WLR_HAS_SYSTEMD) || defined(WLR_HAS_ELOGIND)
+		#if WLR_HAS_SYSTEMD || WLR_HAS_ELOGIND
 			session = session_logind.create(disp);
 		#else
 			wlr_log(WLR_ERROR, "wlroots is not compiled with logind support");
-- 
cgit v1.2.3