Fixes "error: conflicting types for 'GLintptr'"

libsdl-org · Aug 25, 2013 · 64e6eea · 64e6eea
1 parent c9c6852
commit 64e6eea
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -39,9 +39,10 @@
 #include "SDL_opengles.h"
 #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"
-#endif /* SDL_VIDEO_OPENGL_ES2 */
+#endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
 
 #include "SDL_syswm.h"