Because the wayland-server-protocol.h header includes symbols that
collide with wayland-client-protocol.h Cogl now provides top level
<cogl/cogl-wayland-server.h> and <cogl/cogl-wayland-client.h> headers so
that applications can ensure they only include one of the wayland
protocol headers in a particular compilation unit. This updates clutter
accordingly to include those headers.
Reviewed-by: Neil Roberts <neil@linux.intel.com>
Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
#endif
#ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
+#include <cogl/cogl-wayland-server.h>
#include <wayland-server.h>
+#include "wayland/clutter-wayland-compositor.h"
#endif
G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT);
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <cogl/cogl.h>
+#include <cogl/cogl-wayland-client.h>
#define clutter_backend_wayland_get_type _clutter_backend_wayland_get_type
#include <glib.h>
+#include "clutter-wayland.h"
#include "clutter-stage-wayland.h"
#include "clutter-backend-wayland.h"
#include "clutter-stage-window.h"
#include "clutter-stage-private.h"
#include "clutter-event-private.h"
#include <cogl/cogl.h>
+#include <cogl/cogl-wayland-client.h>
static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;
#include "clutter-backend.h"
#include <cogl/cogl.h>
-
-#include <wayland-server.h>
+#include <cogl/cogl-wayland-server.h>
enum
{