[clutter/clutter-1.14] wayland-compositor: Don't use Wayland types in public API

[Emmanuele Bassi <ebassi src gnome org>]

commit a011890bb62b519a939e62a3154266e5046534c2
Author: Daniel Stone <daniel fooishbar org>
Date:   Wed Jan 30 11:47:52 2013 +1100

    wayland-compositor: Don't use Wayland types in public API
    
    The definition of wl_display differs between Wayland clients and
    servers, and it's unsafe to include both wayland-client.h and
    wayland-server.h at the same time.  Fudge around this by making the
    compositor public API use void * rather than struct wl_display *.
    
    Signed-off-by: Daniel Stone <daniel fooishbar org>
    
    https://bugzilla.gnome.org/show_bug.cgi?id=692851

 clutter/clutter-backend.c                    |    2 +-
 clutter/wayland/clutter-wayland-compositor.h |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 25ec0ba..c174ae8 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -1322,7 +1322,7 @@ clutter_backend_get_cogl_context (ClutterBackend *backend)
  * Stability: unstable
  */
 void
-clutter_wayland_set_compositor_display (struct wl_display *display)
+clutter_wayland_set_compositor_display (void *display)
 {
   if (_clutter_context_is_initialized ())
     {
diff --git a/clutter/wayland/clutter-wayland-compositor.h b/clutter/wayland/clutter-wayland-compositor.h
index e8931bc..a3e7971 100644
--- a/clutter/wayland/clutter-wayland-compositor.h
+++ b/clutter/wayland/clutter-wayland-compositor.h
@@ -35,13 +35,10 @@
 #ifndef __CLUTTER_WAYLAND_COMPOSITOR_H__
 #define __CLUTTER_WAYLAND_COMPOSITOR_H__
 
-#include <wayland-server.h>
-#include <clutter/wayland/clutter-wayland-surface.h>
-
 G_BEGIN_DECLS
 
 void
-clutter_wayland_set_compositor_display (struct wl_display *display);
+clutter_wayland_set_compositor_display (void *display);
 
 G_END_DECLS