Zengtudor
/
glew
mirror of https://github.com/nigels-com/glew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert commit b7b516bf88. 

Can't leave APIENTRY defined, it conflicts with windef.h definition of APIENTRY.
This commit is contained in:
Nigel Stewart 2013-03-18 22:23:02 -05:00
parent db6dbecb7a
commit 14854b4ae6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto/src/glew_head.h
View File

@ -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

5
auto/src/glew_tail.h
View File

@ -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