encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes "error: conflicting types for 'GLintptr'"

This commit is contained in:
Gabriel Jacobo 2013-08-25 11:48:49 -03:00
parent c9c6852f84
commit 64e6eeac7f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/SDL_video.c
View File

@ -39,9 +39,10 @@
#include "SDL_opengles.h" #include "SDL_opengles.h"
#endif /* SDL_VIDEO_OPENGL_ES */ #endif /* SDL_VIDEO_OPENGL_ES */
#if SDL_VIDEO_OPENGL_ES2 /* GL and GLES2 headers conflict on Linux 32 bits */
#if SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL
#include "SDL_opengles2.h" #include "SDL_opengles2.h"
#endif /* SDL_VIDEO_OPENGL_ES2 */ #endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
#include "SDL_syswm.h" #include "SDL_syswm.h"