[mutter] Add a missing #ifdef and remove a left-over include to make gbm optional



commit aeef98fd19274f1db5b0028d00bf2d07b9fb13f5
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sun Dec 21 16:54:59 2014 +0800

    Add a missing #ifdef and remove a left-over include to make gbm optional
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741829

 src/backends/meta-cursor-private.h  |    3 +++
 src/backends/meta-cursor-renderer.h |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/backends/meta-cursor-private.h b/src/backends/meta-cursor-private.h
index 4ea16e7..c8440e8 100644
--- a/src/backends/meta-cursor-private.h
+++ b/src/backends/meta-cursor-private.h
@@ -25,7 +25,10 @@
 #include "meta-cursor.h"
 
 #include <cogl/cogl.h>
+
+#ifdef HAVE_NATIVE_BACKEND
 #include <gbm.h>
+#endif
 
 typedef struct {
   CoglTexture2D *texture;
diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h
index b2afe3b..ae60d91 100644
--- a/src/backends/meta-cursor-renderer.h
+++ b/src/backends/meta-cursor-renderer.h
@@ -30,8 +30,6 @@
 #include <meta/screen.h>
 #include "meta-cursor.h"
 
-#include <gbm.h>
-
 #define META_TYPE_CURSOR_RENDERER            (meta_cursor_renderer_get_type ())
 #define META_CURSOR_RENDERER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, 
MetaCursorRenderer))
 #define META_CURSOR_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_CURSOR_RENDERER, 
MetaCursorRendererClass))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]