diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-02 15:03:44 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2005-02-02 15:03:44 +0000 |
| commit | 81b862509c87281705f8a8641c28ae2f45f15751 (patch) | |
| tree | 602d3fec90722c5635292ddcaa1c5d6d66142d7b /GL/windows | |
| parent | b532bfb483cc8ea87c28302e3d676234cab7c3f0 (diff) | |
Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866)
attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818):
Include Xwindows.h before GL/gl.h on windows to prevent loading
windows.h which pollutes our namespace with some symbols.
Diffstat (limited to 'GL/windows')
| -rw-r--r-- | GL/windows/ChangeLog | 9 | ||||
| -rw-r--r-- | GL/windows/glwindows.h | 4 | ||||
| -rwxr-xr-x | GL/windows/glwrap.c | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/GL/windows/ChangeLog b/GL/windows/ChangeLog index 484bc9e7b..030e4e611 100644 --- a/GL/windows/ChangeLog +++ b/GL/windows/ChangeLog @@ -1,3 +1,12 @@ +2005-02-02 Alexander Gottwald <ago at freedesktop dot org> + + * glwrap.c: + * glwindows.h: + Bugzilla #1866 (https://bugs.freedesktop.org/show_bug.cgi?id=1866) + attachment #1818 (https://bugs.freedesktop.org/attachment.cgi?id=1818): + Include Xwindows.h before GL/gl.h to prevent loading windows.h which + pollutes our namespace with some symbols. + 2005-01-27 Alexander Gottwald <ago at freedesktop dot org> * glwrap.c: diff --git a/GL/windows/glwindows.h b/GL/windows/glwindows.h index aa984099c..77581ddba 100644 --- a/GL/windows/glwindows.h +++ b/GL/windows/glwindows.h @@ -1,3 +1,4 @@ +#include <Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> @@ -19,9 +20,6 @@ #include <GL/internal/glcore.h> #include <stdlib.h> -#define WINDOWS_LEAN_AND_CLEAN -#include <windows.h> - typedef struct { unsigned enableDebug : 1; diff --git a/GL/windows/glwrap.c b/GL/windows/glwrap.c index 807e51972..656edc131 100755 --- a/GL/windows/glwrap.c +++ b/GL/windows/glwrap.c @@ -5,15 +5,12 @@ * Authors: Alexander Gottwald */ +#include <Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> #include <glxserver.h> #include <glxext.h> -#define WINDOWS_LEAN_AND_CLEAN -#include <windows.h> - - #define RESOLVE_RET(procname, symbol, retval) \ static Bool init = TRUE; \ static procname proc = NULL; \ |