diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-08-13 20:19:35 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-08-13 20:28:22 -0400 |
| commit | 5f0fab21566ab9c46817f33d1e78f504825402ef (patch) | |
| tree | 5c8f491971fc921f9837af3e847bb3dde2bbaeef /src/backends | |
| parent | 467465c99c413376240e9cbd6d832157660e8776 (diff) | |
| download | mutter-5f0fab21566ab9c46817f33d1e78f504825402ef.tar.gz | |
Conditionalize Wayland support again
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/meta-cursor-renderer.c | 1 | ||||
| -rw-r--r-- | src/backends/meta-cursor-tracker.c | 1 | ||||
| -rw-r--r-- | src/backends/meta-cursor.c | 4 | ||||
| -rw-r--r-- | src/backends/meta-cursor.h | 4 | ||||
| -rw-r--r-- | src/backends/native/meta-launcher.c | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c index 3d1f85718..67f92e597 100644 --- a/src/backends/meta-cursor-renderer.c +++ b/src/backends/meta-cursor-renderer.c @@ -31,7 +31,6 @@ #include <meta/util.h> #include <cogl/cogl.h> -#include <cogl/cogl-wayland-server.h> #include <clutter/clutter.h> #include "meta-stage.h" diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c index 1b231316a..905b5d19f 100644 --- a/src/backends/meta-cursor-tracker.c +++ b/src/backends/meta-cursor-tracker.c @@ -34,7 +34,6 @@ #include <meta/errors.h> #include <cogl/cogl.h> -#include <cogl/cogl-wayland-server.h> #include <clutter/clutter.h> #include <gdk/gdk.h> diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c index 3d88b6815..592e26f32 100644 --- a/src/backends/meta-cursor.c +++ b/src/backends/meta-cursor.c @@ -39,7 +39,9 @@ #include <X11/extensions/Xfixes.h> #include <X11/Xcursor/Xcursor.h> +#ifdef HAVE_WAYLAND #include <cogl/cogl-wayland-server.h> +#endif MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *self) @@ -247,6 +249,7 @@ meta_cursor_reference_from_theme (MetaCursor cursor) return self; } +#ifdef HAVE_WAYLAND static void meta_cursor_image_load_from_buffer (MetaCursorImage *image, struct wl_resource *buffer, @@ -345,6 +348,7 @@ meta_cursor_reference_from_buffer (struct wl_resource *buffer, return self; } +#endif CoglTexture * meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor, diff --git a/src/backends/meta-cursor.h b/src/backends/meta-cursor.h index e9e12907e..b627dc0cc 100644 --- a/src/backends/meta-cursor.h +++ b/src/backends/meta-cursor.h @@ -28,13 +28,15 @@ MetaCursorReference * meta_cursor_reference_ref (MetaCursorReference *cursor); void meta_cursor_reference_unref (MetaCursorReference *cursor); #include <meta/common.h> -#include <wayland-server.h> MetaCursorReference * meta_cursor_reference_from_theme (MetaCursor cursor); +#ifdef HAVE_WAYLAND +#include <wayland-server.h> MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buffer, int hot_x, int hot_y); +#endif MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor); diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c index 70454bb01..2333bee6a 100644 --- a/src/backends/native/meta-launcher.c +++ b/src/backends/native/meta-launcher.c @@ -41,7 +41,6 @@ #include "dbus-utils.h" #include "meta-dbus-login1.h" -#include "wayland/meta-wayland-private.h" #include "backends/meta-backend-private.h" #include "meta-cursor-renderer-native.h" |