diff options
| author | Simon Ser <contact@emersion.fr> | 2021-04-06 11:59:57 +0200 |
|---|---|---|
| committer | Kenny Levinsen <kl@kl.wtf> | 2021-04-09 21:54:38 +0200 |
| commit | 1eb38e001503636a8e5058051e9256d70f1bffcc (patch) | |
| tree | c33d204acec48d036a60033de949519f4c58abe8 /include | |
| parent | 78befa59f96bb0a13e9ffeb4df1272738c6b5012 (diff) | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/x11.h | 4 | ||||
| -rw-r--r-- | include/wlr/config.h.in | 2 | ||||
| -rw-r--r-- | include/xwayland/xwm.h | 4 |
3 files changed, 4 insertions, 6 deletions
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 <xcb/xcb.h> #include <xcb/present.h> -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS #include <xcb/xcb_errors.h> #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 <wlr/config.h> #include <wlr/xwayland.h> #include <xcb/render.h> -#if WLR_HAS_XCB_ERRORS +#if HAS_XCB_ERRORS #include <xcb/xcb_errors.h> #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; |