diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:19:53 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 21:19:53 +0300 |
| commit | eee666c3b57870b7610acc846858814ce8498385 (patch) | |
| tree | 9e7f4493f176783f02da0a40e8df11175fdcbf16 /libvo/gl_common.h | |
| parent | 17dce6e0c8e76c49f2e7567149a0febccb88c4f5 (diff) | |
| parent | bcdf7c0b3dc61a09e0cd83d553bd21dc0f266d04 (diff) | |
| download | mpv-eee666c3b57870b7610acc846858814ce8498385.tar.bz2 mpv-eee666c3b57870b7610acc846858814ce8498385.tar.xz | |
Merge svn changes up to r31133
Diffstat (limited to 'libvo/gl_common.h')
| -rw-r--r-- | libvo/gl_common.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 534bc908c1..65741c899b 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -30,20 +30,16 @@ #ifdef CONFIG_GL_WIN32 #include <windows.h> -#include <GL/gl.h> #include "w32_common.h" #endif #ifdef CONFIG_GL_X11 -#include <GL/gl.h> #include <X11/Xlib.h> #include <GL/glx.h> #include "x11_common.h" // This old-vo wrapper macro would conflict with the struct member #undef update_xinerama_info #endif -#ifdef CONFIG_GL_SDL #include <GL/gl.h> -#endif // workaround for some gl.h headers #ifndef GLAPIENTRY |