aboutsummaryrefslogtreecommitdiff
path: root/xwayland
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2022-12-08 02:04:58 +0100
committerSimon Ser <contact@emersion.fr>2022-12-08 02:06:40 +0100
commit9b7ee63774a0d9e51ee677ed5e924093e71b8847 (patch)
treecd74a9301e814ed9fa0aa93b41058b1edbbff4ea /xwayland
parent1ed513772016623707b9e4c9da5ca3eb8579e0eb (diff)
xwayland: use HAVE_ prefix for xcb_xfixes_set_client_disconnect_mode
86fc2199f85a ("build: unify naming for HAVE_* defines") has switched over all other feature defines from HAS_* to HAVE_*, but missed this one.
Diffstat (limited to 'xwayland')
-rw-r--r--xwayland/meson.build2
-rw-r--r--xwayland/xwayland.c2
-rw-r--r--xwayland/xwm.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/xwayland/meson.build b/xwayland/meson.build
index c21f4383..5d22584b 100644
--- a/xwayland/meson.build
+++ b/xwayland/meson.build
@@ -82,4 +82,4 @@ wlr_deps += xwayland_libs
features += { 'xwayland': true }
have = cc.has_function('xcb_xfixes_set_client_disconnect_mode', dependencies: xwayland_libs)
-internal_config.set10('HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE', have)
+internal_config.set10('HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE', have)
diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c
index abaebd0d..75c09f31 100644
--- a/xwayland/xwayland.c
+++ b/xwayland/xwayland.c
@@ -102,7 +102,7 @@ struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
struct wlr_xwayland_server_options options = {
.lazy = lazy,
.enable_wm = true,
-#if HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
+#if HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
.terminate_delay = lazy ? 10 : 0,
#endif
};
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index 61d29f91..59773c6c 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -2130,7 +2130,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
sizeof(supported)/sizeof(*supported),
supported);
-#if HAS_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
+#if HAVE_XCB_XFIXES_SET_CLIENT_DISCONNECT_MODE
if (xwm->xwayland->server->options.terminate_delay > 0 &&
xwm->xfixes_major_version >= 6) {
xcb_xfixes_set_client_disconnect_mode(xwm->xcb_conn,