mirror of
https://github.com/swaywm/sway.git
synced 2024-11-29 03:11:27 +00:00
Remove WLR_HAS_XDG_FOREIGN checks
References: https://github.com/swaywm/wlroots/pull/2833
(cherry picked from commit 1a72049c04
)
This commit is contained in:
parent
d2d1461855
commit
62e3ca671d
|
@ -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];
|
||||
|
|
Loading…
Reference in a new issue