From 4076e0eb129ad9ef23be6749db5807f5430e4f6a Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Wed, 5 Sep 2012 10:57:34 +0200
Subject: [PATCH] opengl32: Avoid conflicting defines for GLAPI / WINGDIAPI.

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

diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h
index d84ec0d6a2f..eb35e549dda 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
-- 
2.11.4.GIT