ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes so d3d9.h and dsound.h can be included at the same time.

This commit is contained in:
Robert Reif 2005-10-03 11:04:06 +00:00 committed by Alexandre Julliard
parent 025a1a5445
commit e577a2a391
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/d3d9types.h
View File

@ -1225,7 +1225,10 @@ typedef enum _D3DSAMPLERSTATETYPE {
/***************************************************************************** /*****************************************************************************
* Direct 3D v9 typedefs * Direct 3D v9 typedefs
*/ */
#ifndef D3DCOLOR_DEFINED
typedef DWORD D3DCOLOR; typedef DWORD D3DCOLOR;
#define D3DCOLOR_DEFINED
#endif
/***************************************************************************** /*****************************************************************************
* Direct 3D v9 structures * Direct 3D v9 structures
@ -1260,12 +1263,15 @@ typedef struct _D3DCLIPSTATUS9 {
DWORD ClipIntersection; DWORD ClipIntersection;
} D3DCLIPSTATUS9; } D3DCLIPSTATUS9;
#ifndef D3DCOLORVALUE_DEFINED
typedef struct _D3DCOLORVALUE { typedef struct _D3DCOLORVALUE {
float r; float r;
float g; float g;
float b; float b;
float a; float a;
} D3DCOLORVALUE; } D3DCOLORVALUE;
#define D3DCOLORVALUE_DEFINED
#endif
typedef struct _D3DDEVICE_CREATION_PARAMETERS { typedef struct _D3DDEVICE_CREATION_PARAMETERS {
UINT AdapterOrdinal; UINT AdapterOrdinal;
@ -1364,11 +1370,14 @@ typedef struct _D3DINDEXBUFFER_DESC {
UINT Size; UINT Size;
} D3DINDEXBUFFER_DESC; } D3DINDEXBUFFER_DESC;
#ifndef D3DVECTOR_DEFINED
typedef struct _D3DVECTOR { typedef struct _D3DVECTOR {
float x; float x;
float y; float y;
float z; float z;
} D3DVECTOR; } D3DVECTOR;
#define D3DVECTOR_DEFINED
#endif
typedef struct _D3DLIGHT9 { typedef struct _D3DLIGHT9 {
D3DLIGHTTYPE Type; D3DLIGHTTYPE Type;
@ -1410,6 +1419,7 @@ typedef struct _D3DMATERIAL9 {
float Power; float Power;
} D3DMATERIAL9; } D3DMATERIAL9;
#ifndef D3DMATRIX_DEFINED
typedef struct _D3DMATRIX { typedef struct _D3DMATRIX {
union { union {
struct { struct {
@ -1421,6 +1431,8 @@ typedef struct _D3DMATRIX {
float m[4][4]; float m[4][4];
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
} D3DMATRIX; } D3DMATRIX;
#define D3DMATRIX_DEFINED
#endif
typedef struct _D3DPRESENT_PARAMETERS_ { typedef struct _D3DPRESENT_PARAMETERS_ {
UINT BackBufferWidth; UINT BackBufferWidth;
@ -1453,12 +1465,15 @@ typedef struct _D3DRASTER_STATUS {
UINT ScanLine; UINT ScanLine;
} D3DRASTER_STATUS; } D3DRASTER_STATUS;
#ifndef D3DRECT_DEFINED
typedef struct _D3DRECT { typedef struct _D3DRECT {
LONG x1; LONG x1;
LONG y1; LONG y1;
LONG x2; LONG x2;
LONG y2; LONG y2;
} D3DRECT; } D3DRECT;
#define D3DRECT_DEFINED
#endif
typedef struct _D3DRECTPATCH_INFO { typedef struct _D3DRECTPATCH_INFO {
UINT StartVertexOffsetWidth; UINT StartVertexOffsetWidth;

7
include/dsound.h
View File

@ -45,10 +45,15 @@ typedef struct _D3DVECTOR {
float x; float x;
float y; float y;
float z; float z;
} D3DVECTOR, *LPD3DVECTOR; } D3DVECTOR;
#define D3DVECTOR_DEFINED #define D3DVECTOR_DEFINED
#endif #endif
#ifndef LPD3DVECTOR_DEFINED
typedef D3DVECTOR *LPD3DVECTOR;
#define LPD3DVECTOR_DEFINED
#endif
#define DX_SHARED_DEFINES #define DX_SHARED_DEFINES
#endif /* DX_SHARED_DEFINES */ #endif /* DX_SHARED_DEFINES */