include standalone cogl-wayland-server/client headers
authorRobert Bragg <robert@linux.intel.com>
Tue, 20 Mar 2012 13:50:42 +0000 (13:50 +0000)
committerRobert Bragg <robert@linux.intel.com>
Tue, 20 Mar 2012 14:36:50 +0000 (14:36 +0000)
commitcf96c9caf3770f99ad0d9568ac4b76dd0abe5a2c
tree7b76bbae2d6905355deeecdb3a52e2b89ac803f7
parent568951b8aca479f53e36597bcf017c2192be3e77
include standalone cogl-wayland-server/client headers

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>
clutter/clutter-backend.c
clutter/wayland/clutter-backend-wayland.c
clutter/wayland/clutter-stage-wayland.c
clutter/wayland/clutter-wayland-surface.c