mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2680 from marienz/no-x11-backend

Browse source 
Fix compilation against wlroots without X11 backend
This commit is contained in:
emersion 2018-09-21 14:50:02 +02:00 committed by GitHub
parent 057635f1a3 37e51a20cc
commit 65ab6b7eb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/commands/create_output.c
View file

@ -1,6 +1,9 @@
#include <wlr/config.h>
#include <wlr/backend/multi.h> #include <wlr/backend/multi.h>
#include <wlr/backend/wayland.h> #include <wlr/backend/wayland.h>
#ifdef WLR_HAS_X11_BACKEND
#include <wlr/backend/x11.h> #include <wlr/backend/x11.h>
#endif
#include "sway/commands.h" #include "sway/commands.h"
#include "sway/server.h" #include "sway/server.h"
#include "log.h" #include "log.h"
@ -14,10 +17,13 @@ static void create_output(struct wlr_backend *backend, void *data) {
if (wlr_backend_is_wl(backend)) { if (wlr_backend_is_wl(backend)) {
wlr_wl_output_create(backend); wlr_wl_output_create(backend);
*done = true; *done = true;
} else if (wlr_backend_is_x11(backend)) { }
#ifdef WLR_HAS_X11_BACKEND
else if (wlr_backend_is_x11(backend)) {
wlr_x11_output_create(backend); wlr_x11_output_create(backend);
*done = true; *done = true;
} }
#endif
} }
/** /**