diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-21 16:00:17 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-21 16:00:17 +0000 |
| commit | 2743def830bc1dc3bedb302f13db3d65dc4705d7 (patch) | |
| tree | 0565e5c05c3c5dfe7e6ccdfa76b8f51195cb4ab6 /include/GL/gl.h | |
| parent | fa6be6e77a25236481dd78c6912f4bfefeda8b17 (diff) | |
sync'd with the latest changes in XFree86 (cygwin stuff)
Diffstat (limited to 'include/GL/gl.h')
| -rw-r--r-- | include/GL/gl.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index ae03a8b9ec0..46ff10f6f14 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,4 +1,4 @@ -/* $Id: gl.h,v 1.51 2001/01/29 16:18:37 brianp Exp $ */ +/* $Id: gl.h,v 1.52 2001/03/21 16:00:17 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -44,11 +44,11 @@ #define OPENSTEP #endif -#if defined(_WIN32) && !defined(__WIN32__) +#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) #define __WIN32__ #endif -#if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN__)) +#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) # if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) # elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ @@ -63,7 +63,7 @@ # define GLAPIENTRY #endif /* WIN32 / CYGWIN bracket */ -#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) && !defined(__CYGWIN__) #include <gl/mesa_wgl.h> #endif |