isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

include standalone cogl-wayland-server/client headers

Browse Source 
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>
This commit is contained in:
Robert Bragg 2012-03-20 13:50:42 +00:00
parent 568951b8ac
commit cf96c9caf3
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-backend.c
View File

@ -81,7 +81,9 @@
#endif #endif
#ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR #ifdef HAVE_CLUTTER_WAYLAND_COMPOSITOR
#include <cogl/cogl-wayland-server.h>
#include <wayland-server.h> #include <wayland-server.h>
#include "wayland/clutter-wayland-compositor.h"
#endif #endif
G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT); G_DEFINE_ABSTRACT_TYPE (ClutterBackend, clutter_backend, G_TYPE_OBJECT);

1
clutter/wayland/clutter-backend-wayland.c
View File

@ -51,6 +51,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <cogl/cogl-wayland-client.h>
#define clutter_backend_wayland_get_type _clutter_backend_wayland_get_type #define clutter_backend_wayland_get_type _clutter_backend_wayland_get_type

2
clutter/wayland/clutter-stage-wayland.c
View File

@ -30,12 +30,14 @@
#include <glib.h> #include <glib.h>
#include "clutter-wayland.h"
#include "clutter-stage-wayland.h" #include "clutter-stage-wayland.h"
#include "clutter-backend-wayland.h" #include "clutter-backend-wayland.h"
#include "clutter-stage-window.h" #include "clutter-stage-window.h"
#include "clutter-stage-private.h" #include "clutter-stage-private.h"
#include "clutter-event-private.h" #include "clutter-event-private.h"
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <cogl/cogl-wayland-client.h>
static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL; static ClutterStageWindowIface *clutter_stage_window_parent_iface = NULL;

3
clutter/wayland/clutter-wayland-surface.c
View File

@ -48,8 +48,7 @@
#include "clutter-backend.h" #include "clutter-backend.h"
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <cogl/cogl-wayland-server.h>
#include <wayland-server.h>
enum enum
{ {