[PSDK]

- Properly guard d3d9types.h and d3dtypes.h against DIRECT3D_VERSION versions.

svn path=/trunk/; revision=48754

diff --git a/reactos/include/psdk/d3d9types.h b/reactos/include/psdk/d3d9types.h
index ba800bf..7b338da 100644 (file)
--- a/reactos/include/psdk/d3d9types.h
+++ b/reactos/include/psdk/d3d9types.h
@@ -21,6 +21,8 @@
 #ifndef __WINE_D3D9TYPES_H
 #define __WINE_D3D9TYPES_H
 
+#if(DIRECT3D_VERSION >= 0x0900)
+
 #pragma pack(push, 4)
 
 /*****************************************************************************
@@ -1586,4 +1588,6 @@ typedef enum _D3DCOMPOSERECTSOP{
 
 #pragma pack(pop)
 
+#endif /* DIRECT3D_VERSION >= 0x0900 */
+
 #endif /* __WINE_D3D9TYPES_H */

diff --git a/reactos/include/psdk/d3dtypes.h b/reactos/include/psdk/d3dtypes.h
index dc36d4f..5519b53 100644 (file)
--- a/reactos/include/psdk/d3dtypes.h
+++ b/reactos/include/psdk/d3dtypes.h
@@ -27,6 +27,10 @@
 
 /* #include <windows.h> FIXME: Need to include for compatibility. Inclusion caused compile fail */
 
+#if (DIRECT3D_VERSION >= 0x0800)
+#error "You should not include d3dtypes.h when compiling for DX8 or newer."
+#endif
+
 #include <float.h>
 #include <ddraw.h>