From bdbab22de6556e904343d5d4bb21c20595f57b0b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 31 May 2019 21:42:15 +0300
Subject: Fix compilation warnings with new mesa and SDL 1.2

Add workaround to fix SDL redefine bug.
---
 src/render/opengl/mgltypes.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/render/opengl/mgltypes.h')

diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 9cc2644ca..874e4c9ff 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -32,10 +32,16 @@
 #ifndef USE_SDL2
 #define GL_GLEXT_PROTOTYPES 1
 #endif  // USE_SDL2
+#ifdef HAVE_GLEXT
+#define NO_SDL_GLEXT
+#endif  // HAVE_GLEXT
 PRAGMA48(GCC diagnostic push)
 PRAGMA48(GCC diagnostic ignored "-Wshadow")
 #include <SDL_opengl.h>
 PRAGMA48(GCC diagnostic pop)
+#ifdef HAVE_GLEXT
+#include <GL/glext.h>
+#endif  // HAVE_GLEXT
 #ifdef __native_client__
 #include <GL/Regal.h>
 #else  // __native_client__
-- 
cgit v1.2.3-60-g2f50