From b7b516bf888a0b4af77174af7e5884d9b6fd5458 Mon Sep 17 00:00:00 2001
From: Nigel Stewart <nigels@users.sourceforge.net>
Date: Fri, 15 Feb 2013 20:18:56 -0600
Subject: [PATCH] Leave APIENTRY defined at the conclusion of glew.h, since
 APIENTRY is part of the GL interface for GL_ARB_debug_output purposes, etc.

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

diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h
index f33f440..8b23fed 100644
--- a/auto/src/glew_head.h
+++ b/auto/src/glew_head.h
@@ -40,7 +40,6 @@
  */
 /* <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__)
@@ -102,6 +101,7 @@ 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 54023e3..5f07298 100644
--- a/auto/src/glew_tail.h
+++ b/auto/src/glew_tail.h
@@ -51,9 +51,8 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
 }
 #endif
 
-#ifdef GLEW_APIENTRY_DEFINED
-#undef GLEW_APIENTRY_DEFINED
-#undef APIENTRY
+#ifdef GLEW_GLAPIENTRY_DEFINED
+#undef GLEW_GLAPIENTRY_DEFINED
 #undef GLAPIENTRY
 #define GLAPIENTRY
 #endif