brl/mutter
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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

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