From 0c5a0f244d5007c9bb58feeab04601496984de35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= Date: Fri, 7 Apr 2006 13:25:45 +0200 Subject: [PATCH] wined3d: Allow the inclusion of the wined3d headers when the ddraw headers are included. --- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 264e42a1565..2037fc8770e 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -27,8 +27,8 @@ # error You must include config.h to use this header #endif -#if !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) -# error You must include d3d8.h or d3d9.h header to use this header +#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) +# error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif #include "wined3d_types.h" diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 02fc7fbc3f7..88132e40452 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -26,8 +26,8 @@ #define __WINE_WINED3D_TYPES_H /* TODO: remove the dependency on d3d9 or d3d8 */ -#if !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) -# error You must include d3d8.h or d3d9.h header to use this header +#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) +# error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif #define WINED3D_VSHADER_MAX_CONSTANTS 96