From 14854b4ae6caaa6fe2d9b5f808931898f22a129f Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@users.sourceforge.net>
Date: Mon, 18 Mar 2013 22:23:02 -0500
Subject: [PATCH] Revert commit b7b516bf888a0b4af77174af7e5884d9b6fd5458. Can't
 leave APIENTRY defined, it conflicts with windef.h definition of APIENTRY.

---
 auto/src/glew_head.h | 2 +-
 auto/src/glew_tail.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index 8b23fed..f33f440 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -40,6 +40,7 @@
  */
 /* <windef.h> */
 #ifndef APIENTRY
+#define GLEW_APIENTRY_DEFINED
 #  if defined(__MINGW32__) || defined(__CYGWIN__)
 #    define APIENTRY __stdcall
 #  elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
@@ -101,7 +102,6 @@ typedef _W64 int ptrdiff_t;
 #endif
 
 #ifndef GLAPIENTRY
-#define GLEW_GLAPIENTRY_DEFINED
 #define GLAPIENTRY APIENTRY
 #endif
 
diff --git a/auto/src/glew_tail.h b/auto/src/glew_tail.h
index 5f07298..54023e3 100644
--- a/auto/src/glew_tail.h
+++ b/auto/src/glew_tail.h
@@ -51,8 +51,9 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
 }
 #endif
 
-#ifdef GLEW_GLAPIENTRY_DEFINED
-#undef GLEW_GLAPIENTRY_DEFINED
+#ifdef GLEW_APIENTRY_DEFINED
+#undef GLEW_APIENTRY_DEFINED
+#undef APIENTRY
 #undef GLAPIENTRY
 #define GLAPIENTRY
 #endif