Fix macro redefinition warning

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.
2016-04-15 02:02:59 +00:00 · 2016-04-15 02:02:59 +00:00 · 3486c5707b
commit 3486c5707b
parent 8267df75fb
1 changed files with 6 additions and 0 deletions
--- a/samples/opengl/pyramid/oglpfuncs.cpp
+++ b/samples/opengl/pyramid/oglpfuncs.cpp
@ -18,6 +18,12 @@
        #define WIN32_LEAN_AND_MEAN 1
        #define LE_ME_ISDEF
    #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
    #ifdef LE_ME_ISDEF
        #undef WIN32_LEAN_AND_MEAN