From 2270e330b008fbb361af5e2111f60f51a5bc9dac Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sun, 12 Sep 2010 14:51:32 +0000
Subject: [PATCH] [PSDK] - Properly guard d3d9types.h and d3dtypes.h against
 DIRECT3D_VERSION versions.

svn path=/trunk/; revision=48754
---
 reactos/include/psdk/d3d9types.h | 4 ++++
 reactos/include/psdk/d3dtypes.h  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/reactos/include/psdk/d3d9types.h b/reactos/include/psdk/d3d9types.h
index ba800bf18d6..7b338da74bb 100644
--- 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 dc36d4f9bf7..5519b532808 100644
--- 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>