opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI.

4076e0eb · Michael Stefaniuc · Alexandre Julliard · 6a680694 · 4076e0eb
Commit 4076e0eb authored Sep 05, 2012 by Michael Stefaniuc Committed by Alexandre Julliard Sep 05, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

opengl_ext.h dlls/opengl32/opengl_ext.h +2 -4

No files found.
--- 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