Add helper script to use with git-bisect.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index d3dc89b7dfbb2776609ce9e0fc357096d5c0d326..5e8993816a99274c3777784729d6297bd69932b3 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -44,9 +44,14 @@
 
 #endif /* !_WIN32 */
 
+// Prevent including system's glext.h
+#define __glext_h_
+
 #include <GL/gl.h>
 
-#include <GL/glext.h>
+#undef __glext_h_
+
+#include "glext/glext.h"
 
 #ifndef GL_TEXTURE_INDEX_SIZE_EXT
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
@@ -54,7 +59,7 @@
 
 #ifdef _WIN32
 
-#include <GL/wglext.h>
+#include "glext/wglext.h"
 
 #define GLAPIENTRY __stdcall
 
@@ -65,7 +70,7 @@
 #define PFD_SUPPORT_COMPOSITION 0x00008000
 #endif
 
-#ifdef __MINGW32__
+#ifndef WGL_SWAPMULTIPLE_MAX
 
 extern "C"
 typedef struct _WGLSWAP
@@ -76,12 +81,12 @@ typedef struct _WGLSWAP
 
 #define WGL_SWAPMULTIPLE_MAX 16
 
-#endif /* __MINGW32__ */
+#endif /* !WGL_SWAPMULTIPLE_MAX */
 
 #else /* !_WIN32 */
 
 #include <GL/glx.h>
-#include <GL/glext.h>
+#include "glext/glxext.h"
 
 /* Prevent collision with Trace::Bool */
 #undef Bool