From 1eb38e001503636a8e5058051e9256d70f1bffcc Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 6 Apr 2021 11:59:57 +0200 Subject: Remove WLR_HAS_XCB_ERRORS wlroots' dependency on this library doesn't change the features exposed to compositors. It's purely a wlroots implementation detail. Thus downstream compositors shouldn't really care about it. Introduce an "internal_features" dictionary to store the status of such internal dependencies. --- include/backend/x11.h | 4 ++-- include/wlr/config.h.in | 2 -- include/xwayland/xwm.h | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/backend/x11.h b/include/backend/x11.h index 49172235..89760069 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -9,7 +9,7 @@ #include #include -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS #include #endif @@ -103,7 +103,7 @@ struct wlr_x11_backend { // The time we last received an event xcb_timestamp_t time; -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS xcb_errors_context_t *errors_context; #endif diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in index 8a867ece..64abec28 100644 --- a/include/wlr/config.h.in +++ b/include/wlr/config.h.in @@ -10,8 +10,6 @@ #mesondefine WLR_HAS_XWAYLAND -#mesondefine WLR_HAS_XCB_ERRORS - #mesondefine WLR_HAS_XDG_FOREIGN #endif diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h index 32b3135b..587f136b 100644 --- a/include/xwayland/xwm.h +++ b/include/xwayland/xwm.h @@ -5,7 +5,7 @@ #include #include #include -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS #include #endif #include "xwayland/selection.h" @@ -113,7 +113,7 @@ struct wlr_xwm { struct wlr_xwayland_surface *drag_focus; const xcb_query_extension_reply_t *xfixes; -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS xcb_errors_context_t *errors_context; #endif unsigned int last_focus_seq; -- cgit v1.2.3