diff options
| author | Robert Bragg <robert@linux.intel.com> | 2013-10-14 17:41:58 +0100 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2013-10-15 15:06:51 +0100 |
| commit | dff9dd7e38018587aee831c2c549a752cf1dc3c3 (patch) | |
| tree | 102a9be217c46ab0e49ea4095e05287b93386799 | |
| parent | 9259ce64735c8babfd3921cb76eaa1f2e57a109d (diff) | |
| download | cogl-dff9dd7e38018587aee831c2c549a752cf1dc3c3.tar.gz | |
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 <neil@linux.intel.com>
(cherry picked from commit 60fcd9c87cf5d8ae8c41134217ee0e1fa2fbd46e)
| -rw-r--r-- | cogl/cogl-display-private.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cogl/cogl-display-private.h b/cogl/cogl-display-private.h index 04e3d328..d72c535f 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 { |