changes to _WIN32 test and APIENTRY test

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 4c7ccbb2fb6eb6ff3f23fd900d0ebd980e67ebef..bfbaaa81530912884dcee4de3fa625e87079adb9 100644 (file)
--- 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