[cogl/cogl-1.18] Avoid conflicting client/server wayland includes

[Robert Bragg <rbragg src gnome org>]

commit a93e789a7c01429a9bb56793681b62773e95bba4
Author: Robert Bragg <robert linux intel com>
Date:   Mon Oct 14 17:41:58 2013 +0100

    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)

 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 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
 {