diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-27 09:19:44 +0200 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-27 09:20:21 +0200 |
| commit | a0b52a0dff1e69f85e0095c58e3bda0b588caf45 (patch) | |
| tree | 0cf49da32b6f7c71df9f56550c956f170434de9f | |
| parent | 84ce2afe26bdb9ce29c86b191b68ee94d08b5e14 (diff) | |
Fix x11 backend
Need to include wlr/config.h before using the various WLR_HAS_xxx defines
| -rw-r--r-- | backend/backend.c | 5 | ||||
| -rw-r--r-- | include/xwayland/xwm.h | 1 | ||||
| -rw-r--r-- | rootston/input.c | 1 | ||||
| -rw-r--r-- | rootston/output.c | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/backend/backend.c b/backend/backend.c index 02b0b9af..52344dac 100644 --- a/backend/backend.c +++ b/backend/backend.c @@ -11,10 +11,13 @@ #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 -#include <wlr/util/log.h> void wlr_backend_init(struct wlr_backend *backend, const struct wlr_backend_impl *impl) { diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h index 4b15cc84..9e21ea3a 100644 --- a/include/xwayland/xwm.h +++ b/include/xwayland/xwm.h @@ -2,6 +2,7 @@ #define XWAYLAND_XWM_H #include <wayland-server-core.h> +#include <wlr/config.h> #include <wlr/xwayland.h> #include <xcb/render.h> diff --git a/rootston/input.c b/rootston/input.c index 962be9fa..3e1b06fb 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -2,6 +2,7 @@ #include <stdlib.h> #include <wayland-server.h> #include <wlr/backend/libinput.h> +#include <wlr/config.h> #include <wlr/types/wlr_cursor.h> #include <wlr/util/log.h> #include <wlr/xcursor.h> diff --git a/rootston/output.c b/rootston/output.c index 8d6444d6..52ece54d 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -3,6 +3,7 @@ #include <stdbool.h> #include <stdlib.h> #include <time.h> +#include <wlr/config.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_output_layout.h> |