diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-05 15:54:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-05 15:54:08 +0000 |
| commit | 304d11e0e152d48902becd73004c4e8768b78f3e (patch) | |
| tree | 7edcb3756e4649a390410ac85f1b93dff204f4ad /src/mesa/main/glheader.h | |
| parent | 288066985374bcad743c5923474257fb2c52a623 (diff) | |
Updates from Daniel Borca.
Diffstat (limited to 'src/mesa/main/glheader.h')
| -rw-r--r-- | src/mesa/main/glheader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index ef4c9f0a12..bef72783a6 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -127,7 +127,7 @@ /* compatibility guard so we don't need to change client code */ -#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) +#if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) #if 0 # define CALLBACK GLCALLBACK typedef void *HGLRC; @@ -142,7 +142,7 @@ typedef unsigned long COLORREF; #define GL_GLEXT_PROTOTYPES -#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WINGDI_H) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) # define WGL_FONT_LINES 0 # define WGL_FONT_POLYGONS 1 #ifndef _GNU_H_WINDOWS32_FUNCTIONS |