summaryrefslogtreecommitdiffstats
path: root/libvo/gl_common.h
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-19 13:49:44 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-19 13:49:44 +0000
commitf97fd3eff02bd1048750f350230d9e9192ea3dfd (patch)
tree3c86d6b03419b7b7756242463320e8a527704d72 /libvo/gl_common.h
parent0aac4fa9dce9c24d5697e741a0fe58177eeb9df1 (diff)
downloadmpv-f97fd3eff02bd1048750f350230d9e9192ea3dfd.tar.bz2
mpv-f97fd3eff02bd1048750f350230d9e9192ea3dfd.tar.xz
Rename GL_* defines to CONFIG_GL_*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30065 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/gl_common.h')
-rw-r--r--libvo/gl_common.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index f149589878..6fc68d34f5 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -27,12 +27,12 @@
#include "video_out.h"
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
#include <windows.h>
#include <GL/gl.h>
#include "w32_common.h"
#endif
-#ifdef GL_X11
+#ifdef CONFIG_GL_X11
#include <GL/gl.h>
#include <X11/Xlib.h>
#include <GL/glx.h>
@@ -43,7 +43,7 @@
#ifndef GLAPIENTRY
#ifdef APIENTRY
#define GLAPIENTRY APIENTRY
-#elif defined(GL_WIN32)
+#elif defined(CONFIG_GL_WIN32)
#define GLAPIENTRY __stdcall
#else
#define GLAPIENTRY
@@ -362,15 +362,15 @@ typedef struct MPGLContext {
enum MPGLType type;
union {
int w32;
-#ifdef GL_X11
+#ifdef CONFIG_GL_X11
XVisualInfo *x11;
#endif
} vinfo;
union {
-#ifdef GL_WIN32
+#ifdef CONFIG_GL_WIN32
HGLRC w32;
#endif
-#ifdef GL_X11
+#ifdef CONFIG_GL_X11
GLXContext x11;
#endif
} context;