From 7b27b33495f1e70cb5e7754ed9ef72c8e399aebe Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 15 Jun 2006 16:52:01 +0200
Subject: [PATCH] d3d9: Remove dependencies on OpenGL headers and libraries.

---
 dlls/d3d9/Makefile.in    |  3 +--
 dlls/d3d9/d3d9_private.h | 13 -------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/d3d9/Makefile.in b/dlls/d3d9/Makefile.in
index e78c9a0d439..0d0f65d52a7 100644
--- a/dlls/d3d9/Makefile.in
+++ b/dlls/d3d9/Makefile.in
@@ -5,8 +5,7 @@ VPATH     = @srcdir@
 MODULE    = d3d9.dll
 IMPORTLIB = libd3d9.$(IMPLIBEXT)
 IMPORTS   = wined3d user32 gdi32 kernel32
-EXTRAINCL = @X_CFLAGS@
-EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
+EXTRALIBS = -ldxguid -luuid
 
 C_SRCS = \
 	basetexture.c \
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index b114dde7f78..bf967313327 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -23,10 +23,6 @@
 #ifndef __WINE_D3D9_PRIVATE_H
 #define __WINE_D3D9_PRIVATE_H
 
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
-
 #include <stdarg.h>
 
 #define NONAMELESSUNION
@@ -38,15 +34,6 @@
 #include "wine/debug.h"
 #include "wine/unicode.h"
 
-#undef APIENTRY
-#undef CALLBACK
-#undef WINAPI
-
-/* Redefines the constants */
-#define CALLBACK    __stdcall
-#define WINAPI      __stdcall
-#define APIENTRY    WINAPI
-
 #include "gdi.h"
 #include "d3d9.h"
 #include "ddraw.h"