Michael Stefaniuc : opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4076e0eb129ad9ef23be6749db5807f5430e4f6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4076e0eb129ad9ef23be6749db...

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Wed Sep  5 10:57:34 2012 +0200

opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI.

---

 dlls/opengl32/opengl_ext.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index d84ec0d..eb35e54 100644
--- a/dlls/opengl32/opengl_ext.h
+++ b/dlls/opengl32/opengl_ext.h
@@ -19,17 +19,15 @@
 #ifndef __DLLS_OPENGL32_OPENGL_EXT_H
 #define __DLLS_OPENGL32_OPENGL_EXT_H
 
-#undef APIENTRY
-#undef CALLBACK
-#undef WINAPI
-
 #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */
 #include <GL/gl.h>
 #undef  XMD_H
 
 #undef APIENTRY
 #undef CALLBACK
+#undef GLAPI
 #undef WINAPI
+#undef WINGDIAPI
 
 /* Redefines the constants */
 #define CALLBACK    __stdcall