Leave APIENTRY defined at the conclusion of glew.h, since APIENTRY is part of the GL interface for GL_ARB_debug_output purposes, etc.

This commit is contained in:
Nigel Stewart 2013-02-15 20:18:56 -06:00
parent 41c1305a89
commit b7b516bf88
2 changed files with 3 additions and 4 deletions

View File

@ -40,7 +40,6 @@
*/ */
/* <windef.h> */ /* <windef.h> */
#ifndef APIENTRY #ifndef APIENTRY
#define GLEW_APIENTRY_DEFINED
# if defined(__MINGW32__) || defined(__CYGWIN__) # if defined(__MINGW32__) || defined(__CYGWIN__)
# define APIENTRY __stdcall # define APIENTRY __stdcall
# elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) # elif (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
@ -102,6 +101,7 @@ typedef _W64 int ptrdiff_t;
#endif #endif
#ifndef GLAPIENTRY #ifndef GLAPIENTRY
#define GLEW_GLAPIENTRY_DEFINED
#define GLAPIENTRY APIENTRY #define GLAPIENTRY APIENTRY
#endif #endif

View File

@ -51,9 +51,8 @@ GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name);
} }
#endif #endif
#ifdef GLEW_APIENTRY_DEFINED #ifdef GLEW_GLAPIENTRY_DEFINED
#undef GLEW_APIENTRY_DEFINED #undef GLEW_GLAPIENTRY_DEFINED
#undef APIENTRY
#undef GLAPIENTRY #undef GLAPIENTRY
#define GLAPIENTRY #define GLAPIENTRY
#endif #endif