aboutsummaryrefslogtreecommitdiff
path: root/backend/session
diff options
context:
space:
mode:
authorBjörn Esser <besser82@fedoraproject.org>2017-12-26 18:51:27 +0100
committerBjörn Esser <besser82@fedoraproject.org>2017-12-26 18:51:27 +0100
commit57a09c8ca45e0ec023b7be88745b21fc71649c52 (patch)
tree27d6bd1104a3d3795905adfcd9e442aa28c4bf9c /backend/session
parent4d744aeb230f36d990c102a89314f95ff802ca75 (diff)
config: Put all defines into config.h
Diffstat (limited to 'backend/session')
-rw-r--r--backend/session/direct-ipc.c3
-rw-r--r--backend/session/logind.c5
-rw-r--r--backend/session/session.c5
3 files changed, 8 insertions, 5 deletions
diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c
index 0ea51e2f..52cdbbb9 100644
--- a/backend/session/direct-ipc.c
+++ b/backend/session/direct-ipc.c
@@ -18,12 +18,13 @@
#include <linux/major.h>
#endif
#include <xf86drm.h>
+#include "config.h"
#include <wlr/util/log.h>
#include "backend/session/direct-ipc.h"
enum { DRM_MAJOR = 226 };
-#ifdef HAS_LIBCAP
+#ifdef 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 e9d4c8f3..539490de 100644
--- a/backend/session/logind.c
+++ b/backend/session/logind.c
@@ -10,13 +10,14 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <wayland-server.h>
+#include "config.h"
#include <wlr/backend/session/interface.h>
#include <wlr/util/log.h>
-#ifdef HAS_SYSTEMD
+#ifdef WLR_HAS_SYSTEMD
#include <systemd/sd-bus.h>
#include <systemd/sd-login.h>
-#elif 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 0ed54499..725aa1b9 100644
--- a/backend/session/session.c
+++ b/backend/session/session.c
@@ -9,6 +9,7 @@
#include <wayland-server.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
+#include "config.h"
#include <wlr/backend/session.h>
#include <wlr/backend/session/interface.h>
#include <wlr/util/log.h>
@@ -17,9 +18,9 @@ extern const struct session_impl session_logind;
extern const struct session_impl session_direct;
static const struct session_impl *impls[] = {
-#ifdef HAS_SYSTEMD
+#ifdef WLR_HAS_SYSTEMD
&session_logind,
-#elif HAS_ELOGIND
+#elif WLR_HAS_ELOGIND
&session_logind,
#endif
&session_direct,