Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix macro redefinition warning

Browse Source 
APIENTRY is unconditionally defined through windows.h while it already has
been defined previously in oglpfuncs.h, resulting in a macro redefinition
warning. In this case fix the warning by undefining the macro prior to
including windows.h.
This commit is contained in:
Dimitri Schoolwerth
2016-04-15 02:02:59 +00:00
parent 8267df75fb
commit 3486c5707b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/opengl/pyramid/oglpfuncs.cpp
View File

@@ -18,6 +18,12 @@
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#define LE_ME_ISDEF #define LE_ME_ISDEF
#endif #endif
/*
APIENTRY is defined in oglpfuncs.h as well as by windows.h. Undefine
it to prevent a macro redefinition warning.
*/
#undef APIENTRY
#include <windows.h> //For wglGetProcAddress #include <windows.h> //For wglGetProcAddress
#ifdef LE_ME_ISDEF #ifdef LE_ME_ISDEF
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN