summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-03-03 15:00:14 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-03-03 15:00:14 +0000
commit4c7e3c29f7cbf9443b7abe11881504fff3cbfcc2 (patch)
tree60fd99d4175696640fd4af50031f083685eaf4fd /include
parentf9b9cd71d68528171a4253be027b7c182fc63ad8 (diff)
changes to _WIN32 test and APIENTRY test
Diffstat (limited to 'include')
-rw-r--r--include/GL/glext.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/glext.h b/include/GL/glext.h
index 4c7ccbb2fb..bfbaaa8153 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -14,7 +14,7 @@ extern "C" {
#endif
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN32__)
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>
#endif
@@ -23,7 +23,7 @@ extern "C" {
#define GLAPI extern
#endif
-#ifdef GLAPIENTRY
+#if defined(GLAPIENTRY) && !defined(APIENTRY)
#define APIENTRY GLAPIENTRY
#endif