Module: wine Branch: master Commit: fdc1f2d43257fe304c192ec70f5a0305368c9b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc1f2d43257fe304c192ec70f...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Nov 7 13:15:24 2012 +0100
opengl32: Avoid using the system GL headers.
---
dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 3 ++- dlls/opengl32/opengl_ext.c | 1 + dlls/opengl32/opengl_ext.h | 16 +--------------- dlls/opengl32/opengl_norm.c | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index ff26507..ced0252 100644 --- a/dlls/opengl32/Makefile.in +++ b/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 \ diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7bcc34c..7d96653 100755 --- a/dlls/opengl32/make_opengl +++ b/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" diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 49ff332..f7e258a 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/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" diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index eb35e54..5748e0c 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/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 */ diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index ada172b..9e6e363 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/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"