[Cogl] [PATCH] Avoid conflicting client/server wayland includes

Robert Bragg robert at sixbynine.org
Mon Oct 14 09:46:14 PDT 2013


From: Robert Bragg <robert at linux.intel.com>

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.
---
 cogl/cogl-display-private.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cogl/cogl-display-private.h b/cogl/cogl-display-private.h
index 04e3d32..d72c535 100644
--- a/cogl/cogl-display-private.h
+++ b/cogl/cogl-display-private.h
@@ -29,9 +29,6 @@
 #include "cogl-display.h"
 #include "cogl-renderer.h"
 #include "cogl-onscreen-template.h"
-#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
-#include <wayland-server.h>
-#endif
 
 struct _CoglDisplay
 {
-- 
1.8.3.1



More information about the Cogl mailing list