[ros-diffs] [akhaldi] 48754: [PSDK] - Properly guard d3d9types.h and d3dtypes.h against DIRECT3D_VERSION versions.

Author: akhaldi
Date: Sun Sep 12 14:51:32 2010
New Revision: 48754

URL: http://svn.reactos.org/svn/reactos?rev=48754&view=rev
Log:
[PSDK]
- Properly guard d3d9types.h and d3dtypes.h against DIRECT3D_VERSION versions.

Modified:
    trunk/reactos/include/psdk/d3d9types.h
    trunk/reactos/include/psdk/d3dtypes.h

Modified: trunk/reactos/include/psdk/d3d9types.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9types.h?r…
==============================================================================
--- trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3d9types.h [iso-8859-1] Sun Sep 12 14:51:32 2010
@@ -20,6 +20,8 @@
 
 #ifndef __WINE_D3D9TYPES_H
 #define __WINE_D3D9TYPES_H
+
+#if(DIRECT3D_VERSION >= 0x0900)
 
 #pragma pack(push, 4)
 
@@ -1586,4 +1588,6 @@
 
 #pragma pack(pop)
 
+#endif /* DIRECT3D_VERSION >= 0x0900 */
+
 #endif /* __WINE_D3D9TYPES_H */

Modified: trunk/reactos/include/psdk/d3dtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dtypes.h?re…
==============================================================================
--- trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/d3dtypes.h [iso-8859-1] Sun Sep 12 14:51:32 2010
@@ -26,6 +26,10 @@
 #define __WINE_D3DTYPES_H
 
 /* #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>