From 49fefaf1bc370fd3c6f760c79231d65f6596e9c9 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 27 Nov 2017 11:31:22 -0600 Subject: [PATCH] efl_wl: Silence ridiculous warning Including wayland client code before wayland server code causes spurious "struct wl_buffer deprecated" nonsense. Recent ecore_wl2 changes brought wayland client code into Ecore_Wl2.h which caused the warning to trigger here. Simply re-ordering the include files should resolve with no functional change. --- src/lib/efl_wl/efl_wl.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 7f27abbd4f..4a71abc26e 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -14,15 +14,22 @@ #include #include +#include "Ecore_Evas.h" +#include "Ecore_Wl2.h" +#include "Ecore_Input.h" +#include "Evas_GL.h" + +/* We have to include the wayland server stuff after any wayland client stuff + * like Ecore_Wl2.h or we'll get complaints about struct wl_buffer being + * deprecated. + * That's because its deprecated in server code - it's still the name of + * the opaque struct client side. + */ #include #include "xdg-shell-unstable-v6-server-protocol.h" #include "efl-hints-server-protocol.h" #include "dmabuf.h" -#include "Ecore_Evas.h" -#include "Ecore_Wl2.h" -#include "Ecore_Input.h" -#include "Evas_GL.h" # ifdef HAVE_ECORE_X #include "Ecore_X.h" #endif