[PATCH 2/2] opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI
Michael Stefaniuc
mstefani at redhat.de
Wed Sep 5 03:57:34 CDT 2012
---
My antediluvian GL/gl.h defines 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
--
1.7.7.6
More information about the wine-patches
mailing list