diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
| commit | 67b40bd21988fed2f70b1c4f5aea301b28f78298 (patch) | |
| tree | d68ea94ae2d712cb2e991496049bc13f19d9ea60 /libvo/gl_common.h | |
| parent | 9fe4f647824b8067ea4e4f6cf7f699e6c8fa67cb (diff) | |
| parent | f97fd3eff02bd1048750f350230d9e9192ea3dfd (diff) | |
| download | mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.bz2 mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.xz | |
Merge svn changes up to r30065
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 5a3b4c4163..654f13caf9 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 CONFIG_X11 +#ifdef CONFIG_GL_X11 #include <GL/gl.h> #include <X11/Xlib.h> #include <GL/glx.h> @@ -45,7 +45,7 @@ #ifndef GLAPIENTRY #ifdef APIENTRY #define GLAPIENTRY APIENTRY -#elif defined(GL_WIN32) +#elif defined(CONFIG_GL_WIN32) #define GLAPIENTRY __stdcall #else #define GLAPIENTRY @@ -364,15 +364,15 @@ typedef struct MPGLContext { enum MPGLType type; union { int w32; -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 XVisualInfo *x11; #endif } vinfo; union { -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 HGLRC w32; #endif -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 GLXContext x11; #endif } context; |