Commit 64e6eeac7f4804e0b9de93827a049bf7cf4bfcec
2013-08-25T11:48:49
Fixes "error: conflicting types for 'GLintptr'"
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 77abae9..b98069c 100644
--- 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"