aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/efl_wl
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2017-11-27 11:31:22 -0600
committerDerek Foreman <derekf@osg.samsung.com>2017-11-27 11:33:53 -0600
commit49fefaf1bc370fd3c6f760c79231d65f6596e9c9 (patch)
tree1d378d18a0d63ae8ab9ad1a129363bf10d19004d /src/lib/efl_wl
parentProvide a meaningful label (diff)
downloadefl-49fefaf1bc370fd3c6f760c79231d65f6596e9c9.tar.gz
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.
Diffstat (limited to 'src/lib/efl_wl')
-rw-r--r--src/lib/efl_wl/efl_wl.c15
1 files 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 <fcntl.h>
#include <dlfcn.h>
+#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 <wayland-server.h>
#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