From 31e78f479e0a11263340e0f7adeb5af2cf95e31f Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sat, 12 Apr 2003 00:06:42 +0000 Subject: [PATCH] Header files must not include config.h. --- dlls/d3d8/basetexture.c | 2 ++ dlls/d3d8/cubetexture.c | 2 ++ dlls/d3d8/d3d8_main.c | 2 ++ dlls/d3d8/d3d8_private.h | 5 ++++- dlls/d3d8/indexbuffer.c | 2 ++ dlls/d3d8/resource.c | 2 ++ dlls/d3d8/shader.c | 2 ++ dlls/d3d8/stateblock.c | 2 ++ dlls/d3d8/surface.c | 2 ++ dlls/d3d8/swapchain.c | 2 ++ dlls/d3d8/texture.c | 2 ++ dlls/d3d8/vertexbuffer.c | 2 ++ dlls/d3d8/volume.c | 2 ++ dlls/d3d8/volumetexture.c | 1 + dlls/d3d8/vshaderdeclaration.c | 2 ++ dlls/ddraw/d3ddevice/main.h | 2 -- dlls/ddraw/direct3d/main.h | 2 -- dlls/dmusic/dmusic_private.h | 1 - 18 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c index 4691f07da74..ae767ab71c8 100644 --- a/dlls/d3d8/basetexture.c +++ b/dlls/d3d8/basetexture.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index e8f4199fc58..1c3e2fa34dc 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 597fd209723..fe188c16455 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -16,6 +16,8 @@ * */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 286b2321162..99bccf3605d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -21,8 +21,11 @@ #ifndef __WINE_D3DX8_PRIVATE_H #define __WINE_D3DX8_PRIVATE_H +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + /* THIS FILE MUST NOT CONTAIN X11 or MESA DEFINES */ -#include "config.h" #define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ #include #include diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index cba7ae7f9e5..3a578d8439b 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/resource.c b/dlls/d3d8/resource.c index 8828b116b56..0fdfb43f665 100644 --- a/dlls/d3d8/resource.c +++ b/dlls/d3d8/resource.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index 47a9f99766b..b3b2d6076e0 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index 818890ab616..b29adcc49b9 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 32abdd920e5..96708c65cba 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 22c55febf00..809340a6745 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0a44841a87f..de5c0196b12 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index db5061bf04c..c5a1e47d967 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 6eb43fa14b7..e299cd61b01 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 613a9dd30d1..c2a0ae8549b 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -18,6 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/d3d8/vshaderdeclaration.c b/dlls/d3d8/vshaderdeclaration.c index cb1f0342ee9..865e4bccf73 100644 --- a/dlls/d3d8/vshaderdeclaration.c +++ b/dlls/d3d8/vshaderdeclaration.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/ddraw/d3ddevice/main.h b/dlls/ddraw/d3ddevice/main.h index 596fb76c1b6..3782f7fc165 100644 --- a/dlls/ddraw/d3ddevice/main.h +++ b/dlls/ddraw/d3ddevice/main.h @@ -16,8 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" - /* This is defined here so as to be able to put them in 'drivers' */ void InitDefaultStateBlock(STATEBLOCK* lpStateBlock, int version); diff --git a/dlls/ddraw/direct3d/main.h b/dlls/ddraw/direct3d/main.h index 9d768d1e84c..15ed6e6b47a 100644 --- a/dlls/ddraw/direct3d/main.h +++ b/dlls/ddraw/direct3d/main.h @@ -16,8 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" - /* This is defined here so as to be able to put them in 'drivers' */ HRESULT WINAPI diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 74619d17e97..4be1a4cc028 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -20,7 +20,6 @@ #ifndef __WINE_DMUSIC_PRIVATE_H #define __WINE_DMUSIC_PRIVATE_H -#include "config.h" #include "windef.h" #include "wine/debug.h" #include "winbase.h"