From 4c7e3c29f7cbf9443b7abe11881504fff3cbfcc2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 3 Mar 2000 15:00:14 +0000
Subject: [PATCH] changes to _WIN32 test and APIENTRY test

---
 include/GL/glext.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 4c7ccbb2fb6..bfbaaa81530 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
 
-- 
2.30.2