brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecation guards for ClutterGLXTexturePixmap

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-06-09 15:28:39 +01:00
parent 8b70260528
commit b91ec2a82e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/glx/clutter-glx-texture-pixmap.c
View File

@ -45,8 +45,6 @@
#include "config.h" #include "config.h"
#include "clutter-glx-texture-pixmap.h"
#include <string.h> #include <string.h>
#include <GL/glx.h> #include <GL/glx.h>
@ -55,6 +53,8 @@
#include <cogl/cogl-texture-pixmap-x11.h> #include <cogl/cogl-texture-pixmap-x11.h>
#include "clutter-glx-texture-pixmap.h"
G_DEFINE_TYPE (ClutterGLXTexturePixmap, \ G_DEFINE_TYPE (ClutterGLXTexturePixmap, \
clutter_glx_texture_pixmap, \ clutter_glx_texture_pixmap, \
CLUTTER_X11_TYPE_TEXTURE_PIXMAP); CLUTTER_X11_TYPE_TEXTURE_PIXMAP);

4
clutter/glx/clutter-glx-texture-pixmap.h
View File

@ -28,7 +28,7 @@
#include <clutter/x11/clutter-x11-texture-pixmap.h> #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 G_BEGIN_DECLS
@ -87,6 +87,6 @@ gboolean clutter_glx_texture_pixmap_using_extension (ClutterGLXTexturePixm
G_END_DECLS G_END_DECLS
#endif /* !CLUTTER_DISABLE_DEPRECATED || CLUTTER_COMPILATION */ #endif /* !CLUTTER_DISABLE_DEPRECATED || !CLUTTER_COMPILATION */
#endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */ #endif /* __CLUTTER_GLX_TEXTURE_PIXMAP_H__ */