[clutter] Fix deprecation guards for ClutterGLXTexturePixmap
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Fix deprecation guards for ClutterGLXTexturePixmap
- Date: Thu, 9 Jun 2011 14:43:07 +0000 (UTC)
commit b91ec2a82e371e22a89d5cf95d31a78290e7df65
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Thu Jun 9 15:28:39 2011 +0100
Fix deprecation guards for ClutterGLXTexturePixmap
clutter/glx/clutter-glx-texture-pixmap.c | 4 ++--
clutter/glx/clutter-glx-texture-pixmap.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/clutter/glx/clutter-glx-texture-pixmap.c b/clutter/glx/clutter-glx-texture-pixmap.c
index 8d0084c..33fb894 100644
--- a/clutter/glx/clutter-glx-texture-pixmap.c
+++ b/clutter/glx/clutter-glx-texture-pixmap.c
@@ -45,8 +45,6 @@
#include "config.h"
-#include "clutter-glx-texture-pixmap.h"
-
#include <string.h>
#include <GL/glx.h>
@@ -55,6 +53,8 @@
#include <cogl/cogl-texture-pixmap-x11.h>
+#include "clutter-glx-texture-pixmap.h"
+
G_DEFINE_TYPE (ClutterGLXTexturePixmap, \
clutter_glx_texture_pixmap, \
CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
diff --git a/clutter/glx/clutter-glx-texture-pixmap.h b/clutter/glx/clutter-glx-texture-pixmap.h
index c99ffae..b5a2066 100644
--- a/clutter/glx/clutter-glx-texture-pixmap.h
+++ b/clutter/glx/clutter-glx-texture-pixmap.h
@@ -28,7 +28,7 @@
#include <clutter/x11/clutter-x11-texture-pixmap.h>
-#if !defined(CLUTTER_COMPILATION) || defined(CLUTTER_DISABLE_DEPRECATED)
+#if !defined(CLUTTER_DISABLE_COMPILATION) || defined(CLUTTER_COMPILATION)
G_BEGIN_DECLS
@@ -87,6 +87,6 @@ gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixm
G_END_DECLS
-#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */
+#endif /* !CLUTTER_DISABLE_DEPRECATED || !CLUTTER_COMPILATION */
#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]