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

svn path=/trunk/; revision=48754
This commit is contained in:
Amine Khaldi 2010-09-12 14:51:32 +00:00
parent 078476414c
commit 2270e330b0
2 changed files with 8 additions and 0 deletions

View file

@ -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 */

View file

@ -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>