diff options
| author | Daniel Stone <daniels@collabora.com> | 2016-10-31 14:51:18 +0000 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2016-11-01 17:02:38 +0000 |
| commit | 67fe3dbdd061ae2a8451eb0c15ae43f2d5381b20 (patch) | |
| tree | 5da175efb47e67857e97cd7468c3a4e1142eca59 /xwayland | |
| parent | 5b01596e3f571390b503cb074ca893c71ac21dcb (diff) | |
xwayland: Move includes to avoid deprecation warnings
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 <daniels@collabora.com>
Reviewed-by: Yong Bakos <ybakos@humanoriented.com>
Tested-by: Yong Bakos <ybakos@humanoriented.com>
Diffstat (limited to 'xwayland')
| -rw-r--r-- | xwayland/dnd.c | 2 | ||||
| -rw-r--r-- | xwayland/window-manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xwayland/dnd.c b/xwayland/dnd.c index 61edb119..41727b8c 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 0e26d7c4..b6a3aa20 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" |