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

4 files changed, 12 insertions, 12 deletions

diff --git a/include/sway/criteria.h b/include/sway/criteria.h
index 5b5c0f58..23efe9d4 100644
--- a/include/sway/criteria.h
+++ b/include/sway/criteria.h
@@ -25,9 +25,9 @@ struct criteria {
         pcre *instance;
         pcre *con_mark;
         uint32_t con_id; // internal ID
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
         uint32_t id; // X11 window ID
-  #endif
+#endif
         pcre *window_role;
         uint32_t window_type;
         bool floating;
diff --git a/include/sway/server.h b/include/sway/server.h
index fb22125f..b6a6bde3 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -41,11 +41,11 @@ struct sway_server {
 
         struct wlr_xdg_shell *xdg_shell;
         struct wl_listener xdg_shell_surface;
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
         struct sway_xwayland xwayland;
         struct wl_listener xwayland_surface;
         struct wl_listener xwayland_ready;
-  #endif
+#endif
         bool debug_txn_timings;
 
         list_t *transactions;
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
index da74e205..580acd16 100644
--- a/include/sway/tree/layout.h
+++ b/include/sway/tree/layout.h
@@ -27,9 +27,9 @@ struct sway_root {
         struct wlr_output_layout *output_layout;
 
         struct wl_listener output_layout_change;
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
         struct wl_list xwayland_unmanaged; // sway_xwayland_unmanaged::link
-  #endif
+#endif
         struct wl_list drag_icons; // sway_drag_icon::link
 
         struct wlr_texture *debug_tree;
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index af12cf88..d4416dd3 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -14,9 +14,9 @@ struct sway_container;
 enum sway_view_type {
         SWAY_VIEW_XDG_SHELL_V6,
         SWAY_VIEW_XDG_SHELL,
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
         SWAY_VIEW_XWAYLAND,
-  #endif
+#endif
 };
 
 enum sway_view_prop {
@@ -26,9 +26,9 @@ enum sway_view_prop {
         VIEW_PROP_INSTANCE,
         VIEW_PROP_WINDOW_TYPE,
         VIEW_PROP_WINDOW_ROLE,
-  #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
         VIEW_PROP_X11_WINDOW_ID,
-  #endif
+#endif
 };
 
 struct sway_view_impl {
@@ -96,9 +96,9 @@ struct sway_view {
         union {
                 struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
                 struct wlr_xdg_surface *wlr_xdg_surface;
-    #ifdef HAVE_XWAYLAND
+#ifdef HAVE_XWAYLAND
                 struct wlr_xwayland_surface *wlr_xwayland_surface;
-    #endif
+#endif
                 struct wlr_wl_shell_surface *wlr_wl_shell_surface;
         };