Fixes "error: conflicting types for 'GLintptr'"
authorGabriel Jacobo <gabomdq@gmail.com>
Sun, 25 Aug 2013 11:48:49 -0300
changeset 7698a60b3c292f0f
parent 7697 678f71df2c6b
child 7699 80267e65554d
Fixes "error: conflicting types for 'GLintptr'"
src/video/SDL_video.c
     1.1 --- a/src/video/SDL_video.c	Sat Aug 24 21:15:10 2013 -0400
     1.2 +++ b/src/video/SDL_video.c	Sun Aug 25 11:48:49 2013 -0300
     1.3 @@ -39,9 +39,10 @@
     1.4  #include "SDL_opengles.h"
     1.5  #endif /* SDL_VIDEO_OPENGL_ES */
     1.6  
     1.7 -#if SDL_VIDEO_OPENGL_ES2
     1.8 +/* GL and GLES2 headers conflict on Linux 32 bits */
     1.9 +#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
    1.10  #include "SDL_opengles2.h"
    1.11 -#endif /* SDL_VIDEO_OPENGL_ES2 */
    1.12 +#endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
    1.13  
    1.14  #include "SDL_syswm.h"
    1.15