aboutsummaryrefslogtreecommitdiffstats
path: root/sway/server.c
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
committerLibravatar emersion <contact@emersion.fr>2018-11-18 00:33:06 +0100
commitcad851805bea6b4777685df1c6adf8cb9fa71835 (patch)
tree145fcb048cc3df3d04a8b6afb90de68dd2dd80a9 /sway/server.c
parentMerge pull request #3142 from RyanDwyer/move-view-properties (diff)
downloadsway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.gz
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.tar.zst
sway-cad851805bea6b4777685df1c6adf8cb9fa71835.zip
Use #if instead of #ifdef
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/server.c b/sway/server.c
index f06173d1..cd3fcdf6 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -26,7 +26,7 @@
26#include "sway/server.h" 26#include "sway/server.h"
27#include "sway/tree/root.h" 27#include "sway/tree/root.h"
28#include "config.h" 28#include "config.h"
29#ifdef HAVE_XWAYLAND 29#if HAVE_XWAYLAND
30#include "sway/xwayland.h" 30#include "sway/xwayland.h"
31#endif 31#endif
32 32
@@ -94,7 +94,7 @@ bool server_init(struct sway_server *server) {
94 setenv("XCURSOR_THEME", cursor_theme, 1); 94 setenv("XCURSOR_THEME", cursor_theme, 1);
95 } 95 }
96 96
97#ifdef HAVE_XWAYLAND 97#if HAVE_XWAYLAND
98 server->xwayland.wlr_xwayland = 98 server->xwayland.wlr_xwayland =
99 wlr_xwayland_create(server->wl_display, server->compositor, true); 99 wlr_xwayland_create(server->wl_display, server->compositor, true);
100 wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface, 100 wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface,
@@ -164,7 +164,7 @@ bool server_init(struct sway_server *server) {
164 164
165void server_fini(struct sway_server *server) { 165void server_fini(struct sway_server *server) {
166 // TODO: free sway-specific resources 166 // TODO: free sway-specific resources
167#ifdef HAVE_XWAYLAND 167#if HAVE_XWAYLAND
168 wlr_xwayland_destroy(server->xwayland.wlr_xwayland); 168 wlr_xwayland_destroy(server->xwayland.wlr_xwayland);
169#endif 169#endif
170 wl_display_destroy_clients(server->wl_display); 170 wl_display_destroy_clients(server->wl_display);