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

wayland-compositor: Don't use Wayland types in public API

Browse Source 
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
This commit is contained in:
Daniel Stone 2013-01-30 11:47:52 +11:00 committed by Emmanuele Bassi
parent 3e479a3326
commit b37b9d917a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-backend.c
View File

@ -1322,7 +1322,7 @@ clutter_backend_get_cogl_context (ClutterBackend *backend)
* Stability: unstable * Stability: unstable
*/ */
void void
clutter_wayland_set_compositor_display (struct wl_display *display) clutter_wayland_set_compositor_display (void *display)
{ {
if (_clutter_context_is_initialized ()) if (_clutter_context_is_initialized ())
{ {

5
clutter/wayland/clutter-wayland-compositor.h
View File

@ -35,13 +35,10 @@
#ifndef __CLUTTER_WAYLAND_COMPOSITOR_H__ #ifndef __CLUTTER_WAYLAND_COMPOSITOR_H__
#define __CLUTTER_WAYLAND_COMPOSITOR_H__ #define __CLUTTER_WAYLAND_COMPOSITOR_H__
#include <wayland-server.h>
#include <clutter/wayland/clutter-wayland-surface.h>
G_BEGIN_DECLS G_BEGIN_DECLS
void void
clutter_wayland_set_compositor_display (struct wl_display *display); clutter_wayland_set_compositor_display (void *display);
G_END_DECLS G_END_DECLS