forked from enlightenment/efl
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.
This commit is contained in:
parent
68620de801
commit
49fefaf1bc
|
@ -14,15 +14,22 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <dlfcn.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 <wayland-server.h>
|
||||||
#include "xdg-shell-unstable-v6-server-protocol.h"
|
#include "xdg-shell-unstable-v6-server-protocol.h"
|
||||||
#include "efl-hints-server-protocol.h"
|
#include "efl-hints-server-protocol.h"
|
||||||
#include "dmabuf.h"
|
#include "dmabuf.h"
|
||||||
|
|
||||||
#include "Ecore_Evas.h"
|
|
||||||
#include "Ecore_Wl2.h"
|
|
||||||
#include "Ecore_Input.h"
|
|
||||||
#include "Evas_GL.h"
|
|
||||||
# ifdef HAVE_ECORE_X
|
# ifdef HAVE_ECORE_X
|
||||||
#include "Ecore_X.h"
|
#include "Ecore_X.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue