Synchronize X and GL on windows resizes.

[apitrace] / glimports.hpp

diff --git a/glimports.hpp b/glimports.hpp
index 46c80693f9a4c6e13719059adfca1db6cb10f232..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_
 
@@ -63,6 +67,7 @@
 
 #ifdef __MINGW32__
 
+extern "C"
 typedef struct _WGLSWAP
 {
     HDC hdc;
@@ -78,6 +83,9 @@ typedef struct _WGLSWAP
 #include <GL/glx.h>
 #include <GL/glext.h>
 
+/* Prevent collision with Trace::Bool */
+#undef Bool
+
 #endif /* !WIN32 */
 
 #endif /* _GLIMPORTS_HPP_ */