mirror of
https://github.com/Perlmint/glew-cmake.git
synced 2024-11-11 09:33:49 +00:00
Revert commit b7b516bf88
.
Can't leave APIENTRY defined, it conflicts with windef.h definition of APIENTRY.
This commit is contained in:
parent
db6dbecb7a
commit
14854b4ae6
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user