Synchronize X and GL on windows resizes.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index c96a69df7e97d744d1c7b495da376e29a58aa470..4b21083449114031498b91068c2b9af6db6d7777 100644 (file)
--- a/glimports.hpp
+++ b/glimports.hpp
@@ -23,6 +23,10 @@
  *
  **************************************************************************/
 
+/*
+ * Central place for all GL includes, and respective OS dependent headers.
+ */
+
 #ifndef _GLIMPORTS_HPP_
 #define _GLIMPORTS_HPP_
 
@@ -42,7 +46,7 @@
 
 #include <GL/gl.h>
 
-#include "glext.h"
+#include <GL/glext.h>
 
 #ifndef GL_TEXTURE_INDEX_SIZE_EXT
 #define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
@@ -50,7 +54,7 @@
 
 #ifdef WIN32
 
-#include "wglext.h"
+#include <GL/wglext.h>
 
 #define GLAPIENTRY __stdcall
 
@@ -63,6 +67,7 @@
 
 #ifdef __MINGW32__
 
+extern "C"
 typedef struct _WGLSWAP
 {
     HDC hdc;
@@ -76,7 +81,10 @@ typedef struct _WGLSWAP
 #else /* !WIN32 */
 
 #include <GL/glx.h>
-#include "glxext.h"
+#include <GL/glext.h>
+
+/* Prevent collision with Trace::Bool */
+#undef Bool
 
 #endif /* !WIN32 */