diff options
author | Marien Zwart <marienz@google.com> | 2018-09-21 21:25:03 +1000 |
---|---|---|
committer | Marien Zwart <marienz@google.com> | 2018-09-21 21:25:03 +1000 |
commit | 37e51a20cc9f3ff9afebdabdcd3a82b9a08d3302 (patch) | |
tree | 6dd9eae74fd4597a88b74691f937dd1855629088 /sway | |
parent | Merge pull request #2665 from emersion/render-output-segfault (diff) | |
download | sway-37e51a20cc9f3ff9afebdabdcd3a82b9a08d3302.tar.gz sway-37e51a20cc9f3ff9afebdabdcd3a82b9a08d3302.tar.zst sway-37e51a20cc9f3ff9afebdabdcd3a82b9a08d3302.zip |
Fix compilation against wlroots without X11 backend
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands/create_output.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands/create_output.c b/sway/commands/create_output.c index a852c2a0..1c2464ea 100644 --- a/sway/commands/create_output.c +++ b/sway/commands/create_output.c | |||
@@ -1,6 +1,9 @@ | |||
1 | #include <wlr/config.h> | ||
1 | #include <wlr/backend/multi.h> | 2 | #include <wlr/backend/multi.h> |
2 | #include <wlr/backend/wayland.h> | 3 | #include <wlr/backend/wayland.h> |
4 | #ifdef WLR_HAS_X11_BACKEND | ||
3 | #include <wlr/backend/x11.h> | 5 | #include <wlr/backend/x11.h> |
6 | #endif | ||
4 | #include "sway/commands.h" | 7 | #include "sway/commands.h" |
5 | #include "sway/server.h" | 8 | #include "sway/server.h" |
6 | #include "log.h" | 9 | #include "log.h" |
@@ -14,10 +17,13 @@ static void create_output(struct wlr_backend *backend, void *data) { | |||
14 | if (wlr_backend_is_wl(backend)) { | 17 | if (wlr_backend_is_wl(backend)) { |
15 | wlr_wl_output_create(backend); | 18 | wlr_wl_output_create(backend); |
16 | *done = true; | 19 | *done = true; |
17 | } else if (wlr_backend_is_x11(backend)) { | 20 | } |
21 | #ifdef WLR_HAS_X11_BACKEND | ||
22 | else if (wlr_backend_is_x11(backend)) { | ||
18 | wlr_x11_output_create(backend); | 23 | wlr_x11_output_create(backend); |
19 | *done = true; | 24 | *done = true; |
20 | } | 25 | } |
26 | #endif | ||
21 | } | 27 | } |
22 | 28 | ||
23 | /** | 29 | /** |