commit e577a2a3918ce8443285f6497b1415f89b48b6ac
author Robert Reif <reif@earthlink.net> Mon Oct 03 11:04:06 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 03 11:04:06 2005 +0000
tree a8c6cc4d8a366b87557877999a23f603e7883476
parent 025a1a5445b96adbfde07ec8bcf2a11a31f2c5ee

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

include/d3d9types.h

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