Stefan Dösinger : wined3d: Allow the inclusion of the wined3d headers when the ddraw headers are included .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 0c5a0f244d5007c9bb58feeab04601496984de35
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=0c5a0f244d5007c9bb58feea...

Author: Stefan Dösinger <stefandoesinger(a)gmx.at>
Date:   Fri Apr  7 13:25:45 2006 +0200

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 264e42a..2037fc8 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 02fc7fb..88132e4 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