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.
This commit is contained in:
Alexander Gottwald 2005-02-02 15:03:44 +00:00
parent b532bfb483
commit 81b862509c
3 changed files with 11 additions and 7 deletions

View File

@ -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:

View File

@ -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;

View File

@ -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; \