opengl32: Avoid using the system GL headers.

dlls/opengl32/Makefile.in

@@ -1,7 +1,6 @@
 MODULE    = opengl32.dll
 IMPORTLIB = opengl32
 IMPORTS   = user32 gdi32 advapi32
-EXTRAINCL = @X_CFLAGS@
 
 C_SRCS = \
 	opengl_ext.c \

dlls/opengl32/make_opengl

@@ -945,9 +945,9 @@ print NORM "
 
 #include \"config.h\"
 #include <stdarg.h>
-#include \"opengl_ext.h\"
 #include \"winternl.h\"
 #include \"wingdi.h\"
+#include \"wine/wgl.h\"
 #include \"wine/wgl_driver.h\"
 #include \"wine/debug.h\"
 
@@ -991,6 +991,7 @@ print EXT "
 #include \"opengl_ext.h\"
 #include \"winternl.h\"
 #include \"wingdi.h\"
+#include \"wine/wgl.h\"
 #define WGL_WGLEXT_PROTOTYPES
 #include \"wine/wglext.h\"
 #include \"wine/wgl_driver.h\"

dlls/opengl32/opengl_ext.c

@@ -6,6 +6,7 @@
 #include "opengl_ext.h"
 #include "winternl.h"
 #include "wingdi.h"
+#include "wine/wgl.h"
 #define WGL_WGLEXT_PROTOTYPES
 #include "wine/wglext.h"
 #include "wine/wgl_driver.h"

dlls/opengl32/opengl_ext.h

@@ -19,22 +19,8 @@
 #ifndef __DLLS_OPENGL32_OPENGL_EXT_H
 #define __DLLS_OPENGL32_OPENGL_EXT_H
 
-#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
-#define WINAPI      __stdcall
-#define APIENTRY    WINAPI
-
 #include "windef.h"
+#include "wine/wgl.h"
 
 typedef struct {
   const char  *name;     /* name of the extension */

dlls/opengl32/opengl_norm.c

@@ -3,9 +3,9 @@
 
 #include "config.h"
 #include <stdarg.h>
-#include "opengl_ext.h"
 #include "winternl.h"
 #include "wingdi.h"
+#include "wine/wgl.h"
 #include "wine/wgl_driver.h"
 #include "wine/debug.h"