From 676965ea5090a00ebb9f6f47da1c2a03bad7060d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Wed, 20 Apr 2011 21:08:17 +0100 Subject: [PATCH] More effective prevention against including system's glext.h. --- {GL => glext}/glext.h | 0 {GL => glext}/glxext.h | 0 {GL => glext}/wglext.h | 0 glimports.hpp | 11 ++++++++--- 4 files changed, 8 insertions(+), 3 deletions(-) rename {GL => glext}/glext.h (100%) rename {GL => glext}/glxext.h (100%) rename {GL => glext}/wglext.h (100%) 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 -#include +#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 +#include "glext/wglext.h" #define GLAPIENTRY __stdcall @@ -81,7 +86,7 @@ typedef struct _WGLSWAP #else /* !_WIN32 */ #include -#include +#include "glext/glxext.h" /* Prevent collision with Trace::Bool */ #undef Bool -- 2.7.4