From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 20 Apr 2011 20:08:17 +0000 (+0100)
Subject: More effective prevention against including system's glext.h.
X-Git-Tag: 2.0_alpha^2~1037
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=676965ea5090a00ebb9f6f47da1c2a03bad7060d;p=tools%2Fapitrace.git

More effective prevention against including system's glext.h.
---

diff --git a/GL/glext.h b/glext/glext.h
similarity index 100%
rename from GL/glext.h
rename to glext/glext.h
diff --git a/GL/glxext.h b/glext/glxext.h
similarity index 100%
rename from GL/glxext.h
rename to glext/glxext.h
diff --git a/GL/wglext.h b/glext/wglext.h
similarity index 100%
rename from GL/wglext.h
rename to glext/wglext.h
diff --git a/glimports.hpp b/glimports.hpp
index d3dc89b..5277a0a 100644
--- 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
 
@@ -81,7 +86,7 @@ typedef struct _WGLSWAP
 #else /* !_WIN32 */
 
 #include <GL/glx.h>
-#include <GL/glext.h>
+#include "glext/glxext.h"
 
 /* Prevent collision with Trace::Bool */
 #undef Bool