mirror of
https://github.com/brl/mutter.git
synced 2024-11-13 01:36:10 -05:00
Fix deprecation guards for ClutterGLXTexturePixmap
This commit is contained in:
parent
8b70260528
commit
b91ec2a82e
@ -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);
|
||||
|
@ -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__ */
|
||||
|
Loading…
Reference in New Issue
Block a user