From a93e789a7c01429a9bb56793681b62773e95bba4 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Mon, 14 Oct 2013 17:41:58 +0100 Subject: [PATCH] Avoid conflicting client/server wayland includes 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 (cherry picked from commit 60fcd9c87cf5d8ae8c41134217ee0e1fa2fbd46e) --- 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 04e3d3284..d72c535f9 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 -#endif struct _CoglDisplay {