aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-04-11 19:14:05 +0200
committerKenny Levinsen <kl@kl.wtf>2021-06-24 18:10:01 +0200
commit62e3ca671da063ec470101b2960d705c897ca8d9 (patch)
tree9e4a4d47cd166b560fd94f49a144c049a12dec08
parentd2d1461855208da9444ca51d2edddbe90d48c8c3 (diff)
Remove WLR_HAS_XDG_FOREIGN checks
References: https://github.com/swaywm/wlroots/pull/2833 (cherry picked from commit 1a72049c04b8c6e1a30f80b3887fc7808a717935)
-rw-r--r--sway/server.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sway/server.c b/sway/server.c
index 278afd19..418f3370 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -26,11 +26,9 @@
#include <wlr/types/wlr_viewporter.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_xdg_decoration_v1.h>
-#if WLR_HAS_XDG_FOREIGN
#include <wlr/types/wlr_xdg_foreign_registry.h>
#include <wlr/types/wlr_xdg_foreign_v1.h>
#include <wlr/types/wlr_xdg_foreign_v2.h>
-#endif
#include <wlr/types/wlr_xdg_output_v1.h>
#include "config.h"
#include "list.h"
@@ -156,12 +154,10 @@ bool server_init(struct sway_server *server) {
wlr_primary_selection_v1_device_manager_create(server->wl_display);
wlr_viewporter_create(server->wl_display);
-#if WLR_HAS_XDG_FOREIGN
struct wlr_xdg_foreign_registry *foreign_registry =
wlr_xdg_foreign_registry_create(server->wl_display);
wlr_xdg_foreign_v1_create(server->wl_display, foreign_registry);
wlr_xdg_foreign_v2_create(server->wl_display, foreign_registry);
-#endif
// Avoid using "wayland-0" as display socket
char name_candidate[16];