diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-03 17:03:19 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-03-03 17:03:21 +0100 |
| commit | 7d1870c6f1c1dd14fe9fe13885021970f0cbdbe8 (patch) | |
| tree | 913f3a92d12eac96d70a8ae44978cadf15d9919f /xwayland | |
| parent | f4817916697c10f9361d0e78aa6d7979db5c850a (diff) | |
| download | wlroots-7d1870c6f1c1dd14fe9fe13885021970f0cbdbe8.tar.xz | |
move xwm.h out of include/wlr
xwm.h was meant to be private, so move it to include/xwayland/xwm.h
We had an ifdef WLR_HAS_XCB_ICCCM in xwayland.h which was easy to move
to xwm, it is not safe to use the WLR_HAS_* in the public headers.
I checked a few of our current users and none rely on xwm.h being
public as expected (rootston, sway, hsroots)
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/selection.c | 2 | ||||
| -rw-r--r-- | xwayland/xwayland.c | 2 | ||||
| -rw-r--r-- | xwayland/xwm.c | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/xwayland/selection.c b/xwayland/selection.c index ffcde4d0..1d390026 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -7,8 +7,8 @@ #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_primary_selection.h> #include <wlr/util/log.h> -#include <wlr/xwm.h> #include <xcb/xfixes.h> +#include "xwayland/xwm.h" static const size_t incr_chunk_size = 64 * 1024; diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index 8dffd040..d49dd718 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -18,9 +18,9 @@ #include <wayland-server.h> #include <wlr/util/log.h> #include <wlr/xwayland.h> -#include <wlr/xwm.h> #include "sockets.h" #include "util/signal.h" +#include "xwayland/xwm.h" #ifdef __FreeBSD__ static inline int clearenv(void) { diff --git a/xwayland/xwm.c b/xwayland/xwm.c index ca6786db..b4042ad6 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -9,19 +9,12 @@ #include <wlr/util/log.h> #include <wlr/xcursor.h> #include <wlr/xwayland.h> -#include <wlr/xwm.h> #include <xcb/composite.h> #include <xcb/render.h> #include <xcb/xcb_image.h> #include <xcb/xfixes.h> #include "util/signal.h" - -#ifdef WLR_HAS_XCB_ICCCM - #include <xcb/xcb_icccm.h> -#endif -#ifdef WLR_HAS_XCB_ERRORS - #include <xcb/xcb_errors.h> -#endif +#include "xwayland/xwm.h" const char *atom_map[ATOM_LAST] = { "WL_SURFACE_ID", |