Mercurial > mplayer.hg

comparison libvo/gl_common.h @ 31065:7fb89ca1891c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid duplicating the GL/gl.h include.
author reimar
date Fri, 30 Apr 2010 19:03:13 +0000
parents 4fdb46b8c2c9
children 1a35ec7c45e0
comparison
equal deleted inserted replaced
31064:7d174bdfcd9a 31065:7fb89ca1891c
28 #include "video_out.h" 28 #include "video_out.h"
29 #include "csputils.h" 29 #include "csputils.h"
30 30
31 #ifdef CONFIG_GL_WIN32 31 #ifdef CONFIG_GL_WIN32
32 #include <windows.h> 32 #include <windows.h>
33 #include <GL/gl.h>
34 #include "w32_common.h" 33 #include "w32_common.h"
35 #endif 34 #endif
36 #ifdef CONFIG_GL_X11 35 #ifdef CONFIG_GL_X11
37 #include <GL/gl.h>
38 #include <X11/Xlib.h> 36 #include <X11/Xlib.h>
39 #include <GL/glx.h> 37 #include <GL/glx.h>
40 #include "x11_common.h" 38 #include "x11_common.h"
41 #endif 39 #endif
42 #ifdef CONFIG_GL_SDL
43 #include <GL/gl.h> 40 #include <GL/gl.h>
44 #endif
45 41
46 // workaround for some gl.h headers 42 // workaround for some gl.h headers
47 #ifndef GLAPIENTRY 43 #ifndef GLAPIENTRY
48 #ifdef APIENTRY 44 #ifdef APIENTRY
49 #define GLAPIENTRY APIENTRY 45 #define GLAPIENTRY APIENTRY