diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-21 09:44:20 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-07-21 09:44:20 -0400 |
| commit | 4b096fc1147db07c343ebe7ed286ec1910dd0b7e (patch) | |
| tree | 785d688601dc0fb92d56b1304ed07dfbd92458f7 /backend | |
| parent | 83009d69bf7c0aee3de996b92f892e469d436291 (diff) | |
Revert "Merge pull request #1153 from emersion/include-config"
This reverts commit ef0a6ea4d2934ec014d791150c42348061ec4f7f, reversing
changes made to 8d03bc9178d8544cbcd24293ece6ac9f1698e602.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/backend.c | 3 | ||||
| -rw-r--r-- | backend/session/direct-ipc.c | 1 | ||||
| -rw-r--r-- | backend/session/logind.c | 1 | ||||
| -rw-r--r-- | backend/session/session.c | 1 | ||||
| -rw-r--r-- | backend/x11/backend.c | 1 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/backend/backend.c b/backend/backend.c index bf71ce31..78b90007 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -13,7 +13,10 @@ #include <wlr/backend/multi.h> #include <wlr/backend/session.h> #include <wlr/backend/wayland.h> +#include <wlr/config.h> #include <wlr/util/log.h> + +/* WLR_HAS_X11_BACKEND needs to be after wlr/config.h */ #ifdef WLR_HAS_X11_BACKEND #include <wlr/backend/x11.h> #endif diff --git a/backend/session/direct-ipc.c b/backend/session/direct-ipc.c index bcaf7bba..5fdb95ac 100644 --- a/backend/session/direct-ipc.c +++ b/backend/session/direct-ipc.c @@ -13,6 +13,7 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> +#include <wlr/config.h> #include <wlr/util/log.h> #include <xf86drm.h> #ifdef __linux__ diff --git a/backend/session/logind.c b/backend/session/logind.c index 47082c20..2f816b95 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -11,6 +11,7 @@ #include <unistd.h> #include <wayland-server.h> #include <wlr/backend/session/interface.h> +#include <wlr/config.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/backend/session/session.c b/backend/session/session.c index 67d20004..8d74bafe 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -9,6 +9,7 @@ #include <wayland-server.h> #include <wlr/backend/session.h> #include <wlr/backend/session/interface.h> +#include <wlr/config.h> #include <wlr/util/log.h> #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 077433a4..e0f5d6e7 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -7,6 +7,7 @@ #include <wayland-server.h> #include <wlr/backend/interface.h> #include <wlr/backend/x11.h> +#include <wlr/config.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_pointer.h> diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 890dd629..a16da1c9 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -1,4 +1,5 @@ #include <stdlib.h> +#include <wlr/config.h> #include <wlr/interfaces/wlr_input_device.h> #include <wlr/interfaces/wlr_keyboard.h> #include <wlr/interfaces/wlr_pointer.h> |