brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid conflicting client/server wayland includes

Browse Source 
This avoids including wayland-server.h in cogl-display-private.h which
avoid lots of compile time warnings that wl_buffer is deprecated. The
problem is that wl_buffer is also exposed in the client side headers and
isn't deprecated for clients. If we end up including the client and
server headers in the same compilation unit we can get conflicting
definitions.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 60fcd9c87cf5d8ae8c41134217ee0e1fa2fbd46e)
This commit is contained in:
Robert Bragg 2013-10-14 17:41:58 +01:00
parent 8392420244
commit a93e789a7c
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cogl/cogl-display-private.h
View File

@ -29,9 +29,6 @@
#include "cogl-display.h" #include "cogl-display.h"
#include "cogl-renderer.h" #include "cogl-renderer.h"
#include "cogl-onscreen-template.h" #include "cogl-onscreen-template.h"
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
#include <wayland-server.h>
#endif
struct _CoglDisplay struct _CoglDisplay
{ {