compositor.h already helpfully defines WL_HIDE_DEPRECATED for us, so we
don't get warnings about wl_buffer (in particular) being deprecated when
we have wayland-server headers defining it as deprecated, and then
wayland-client headers using the type.

Move it to be before all our other includes, so we actually make use of
it.

Signed-off-by: Daniel Stone <[email protected]>
---
 xwayland/dnd.c            | 2 +-
 xwayland/window-manager.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwayland/dnd.c b/xwayland/dnd.c
index 61edb11..41727b8 100644
--- a/xwayland/dnd.c
+++ b/xwayland/dnd.c
@@ -37,10 +37,10 @@
 #include <signal.h>
 #include <X11/Xcursor/Xcursor.h>
 
+#include "compositor.h"
 #include "xwayland.h"
 
 #include "cairo-util.h"
-#include "compositor.h"
 #include "hash.h"
 
 static void
diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
index 0e26d7c..b6a3aa2 100644
--- a/xwayland/window-manager.c
+++ b/xwayland/window-manager.c
@@ -38,11 +38,11 @@
 #include <X11/Xcursor/Xcursor.h>
 #include <linux/input.h>
 
+#include "compositor.h"
 #include "xwayland.h"
 #include "xwayland-internal-interface.h"
 
 #include "cairo-util.h"
-#include "compositor.h"
 #include "hash.h"
 #include "shared/helpers.h"
 
-- 
2.9.3

_______________________________________________
wayland-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/wayland-devel

Reply via email to