style fixes, exclude sway/desctop/xwayland.c when enable_xwayland: false

meson_options.txt

@@ -1,4 +1,4 @@
 option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.')
 option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
 option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
-option('enable-xwayland', type: 'boolean', value: false, description: 'Enable support X11 applications')
+option('enable-xwayland', type: 'boolean', value: true, description: 'Enable support for X11 applications')

sway/desktop/xwayland.c

@@ -1,5 +1,4 @@
 #define _POSIX_C_SOURCE 199309L
-#ifdef HAVE_XWAYLAND
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wayland-server.h>
@@ -592,4 +591,3 @@ void handle_xwayland_ready(struct wl_listener *listener, void *data) {
 
 	xcb_disconnect(xcb_conn);
 }
-#endif

sway/meson.build

@@ -18,7 +18,6 @@ sway_sources = files(
 	'desktop/transaction.c',
 	'desktop/xdg_shell_v6.c',
 	'desktop/xdg_shell.c',
-	'desktop/xwayland.c',
 
 	'input/input-manager.c',
 	'input/seat.c',
@@ -152,6 +151,10 @@ sway_sources = files(
 	'tree/output.c',
 )
 
+if get_option('enable-xwayland')
+	sway_sources += 'desktop/xwayland.c'
+endif
+
 sway_deps = [
 	cairo,
 	gdk_pixbuf,