Handle EXT_vertex_arrays and EXT_draw_range_elements.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index 4b21083449114031498b91068c2b9af6db6d7777..5e8993816a99274c3777784729d6297bd69932b3 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -30,7 +30,7 @@
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
@@ -38,23 +38,28 @@
 
 #include <windows.h>
 
-#else /* !WIN32 */
+#else /* !_WIN32 */
 
 #include <X11/Xlib.h>
 
-#endif /* !WIN32 */
+#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
 #endif
 
-#ifdef WIN32
+#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,16 +81,16 @@ typedef struct _WGLSWAP
 
 #define WGL_SWAPMULTIPLE_MAX 16
 
-#endif /* __MINGW32__ */
+#endif /* !WGL_SWAPMULTIPLE_MAX */
 
-#else /* !WIN32 */
+#else /* !_WIN32 */
 
 #include <GL/glx.h>
-#include <GL/glext.h>
+#include "glext/glxext.h"
 
 /* Prevent collision with Trace::Bool */
 #undef Bool
 
-#endif /* !WIN32 */
+#endif /* !_WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */