commit 99acd7dfa3ea77c5707191ca4d9383169b47f027
author Francois Gouget <fgouget@free.fr> Sun Dec 03 03:16:05 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Dec 03 03:16:05 2000 +0000
tree 655475838be49458daab5a926b560bc6dae33f71
parent e4d09327ef223ff190a589a13e93025386f17a7b

Use the DUMMYUNIONNAME macros so that the headers can be used in
Winelib.

include/d3dtypes.h

diff --git a/include/d3dtypes.h b/include/d3dtypes.h
index cbfd914..955a590 100644
--- a/include/d3dtypes.h
+++ b/include/d3dtypes.h
@@ -156,15 +156,15 @@
  union {
     D3DVALUE    hx;
     D3DVALUE    dvHX;
-  } x;
+  } DUMMYUNIONNAME1;
   union {
     D3DVALUE    hy;
     D3DVALUE    dvHY;
-  } y;
+  } DUMMYUNIONNAME2;
   union {
     D3DVALUE    hz;
     D3DVALUE    dvHZ;
-  } z;
+  } DUMMYUNIONNAME3;
 } D3DHVERTEX, *LPD3DHVERTEX;
 
 /*
@@ -174,35 +174,35 @@
   union {
     D3DVALUE    sx;
     D3DVALUE    dvSX;
-  } x;
+  } DUMMYUNIONNAME1;
   union {
     D3DVALUE    sy;
     D3DVALUE    dvSY;
-  } y;
+  } DUMMYUNIONNAME2;
   union {
     D3DVALUE    sz;
     D3DVALUE    dvSZ;
-  } z;
+  } DUMMYUNIONNAME3;
   union {
     D3DVALUE    rhw;
     D3DVALUE    dvRHW;
-  } r;
+  } DUMMYUNIONNAME4;
   union {
     D3DCOLOR    color;
     D3DCOLOR    dcColor;
-  } c;
+  } DUMMYUNIONNAME5;
   union {
     D3DCOLOR    specular;
     D3DCOLOR    dcSpecular;
-  } s;
+  } DUMMYUNIONNAME6;
   union {
     D3DVALUE    tu;
     D3DVALUE    dvTU;
-  } u;
+  } DUMMYUNIONNAME7;
   union {
     D3DVALUE    tv;
     D3DVALUE    dvTV;
-  } v;
+  } DUMMYUNIONNAME8;
   /* There are C++ members associated with this class */
 } D3DTLVERTEX, *LPD3DTLVERTEX;
 
@@ -210,67 +210,67 @@
   union {
     D3DVALUE x;
     D3DVALUE dvX;
-  } x;
+  } DUMMYUNIONNAME1;
   union {
     D3DVALUE y;
     D3DVALUE dvY;
-  } y;
+  } DUMMYUNIONNAME2;
   union {
     D3DVALUE z;
     D3DVALUE dvZ;
-  } z;
+  } DUMMYUNIONNAME3;
   DWORD            dwReserved;
   union {
     D3DCOLOR     color;
     D3DCOLOR     dcColor;
-  } c;
+  } DUMMYUNIONNAME4;
   union {
     D3DCOLOR     specular;
     D3DCOLOR     dcSpecular;
-  } s;
+  } DUMMYUNIONNAME5;
   union {
     D3DVALUE     tu;
     D3DVALUE     dvTU;
-  } u;
+  } DUMMYUNIONNAME6;
   union {
     D3DVALUE     tv;
     D3DVALUE     dvTV;
-  } v;
+  } DUMMYUNIONNAME7;
 } D3DLVERTEX, *LPD3DLVERTEX;
 
 typedef struct _D3DVERTEX {
   union {
     D3DVALUE     x;
     D3DVALUE     dvX;
-  } x;
+  } DUMMYUNIONNAME1;
   union {
     D3DVALUE     y;
     D3DVALUE     dvY;
-  } y;
+  } DUMMYUNIONNAME2;
   union {
     D3DVALUE     z;
     D3DVALUE     dvZ;
-  } z;
+  } DUMMYUNIONNAME3;
   union {
     D3DVALUE     nx;
     D3DVALUE     dvNX;
-  } nx;
+  } DUMMYUNIONNAME4;
   union {
     D3DVALUE     ny;
     D3DVALUE     dvNY;
-  } ny;
+  } DUMMYUNIONNAME5;
   union {
     D3DVALUE     nz;
     D3DVALUE     dvNZ;
-  } nz;
+  } DUMMYUNIONNAME6;
   union {
     D3DVALUE     tu;
     D3DVALUE     dvTU;
-  } u;
+  } DUMMYUNIONNAME7;
   union {
     D3DVALUE     tv;
     D3DVALUE     dvTV;
-  } v;
+  } DUMMYUNIONNAME8;
   /* FIXME: Some C++ stuff to go here */
 } D3DVERTEX, *LPD3DVERTEX;
 
@@ -432,23 +432,23 @@
   union {
     D3DCOLORVALUE   diffuse;
     D3DCOLORVALUE   dcvDiffuse;
-  } a;
+  } DUMMYUNIONNAME;
   union {
     D3DCOLORVALUE   ambient;
     D3DCOLORVALUE   dcvAmbient;
-  } b;
+  } DUMMYUNIONNAME1;
   union {
     D3DCOLORVALUE   specular;
     D3DCOLORVALUE   dcvSpecular;
-  } c;
+  } DUMMYUNIONNAME2;
   union {
     D3DCOLORVALUE   emissive;
     D3DCOLORVALUE   dcvEmissive;
-  } d;
+  } DUMMYUNIONNAME3;
   union {
     D3DVALUE        power;
     D3DVALUE        dvPower;
-  } e;
+  } DUMMYUNIONNAME4;
   D3DTEXTUREHANDLE    hTexture;
   DWORD               dwRampSize;
 } D3DMATERIAL, *LPD3DMATERIAL;
@@ -911,11 +911,11 @@
     D3DTRANSFORMSTATETYPE dtstTransformStateType;
     D3DLIGHTSTATETYPE     dlstLightStateType;
     D3DRENDERSTATETYPE    drstRenderStateType;
-  } t;
+  } DUMMYUNIONNAME1;
   union {
     DWORD                 dwArg[1];
     D3DVALUE              dvArg[1];
-  } v;
+  } DUMMYUNIONNAME2;
 } D3DSTATE, *LPD3DSTATE;
 
 typedef struct _D3DMATRIXLOAD {
@@ -1064,15 +1064,15 @@
   union {
     WORD v1;
     WORD wV1;
-  } v1;
+  } DUMMYUNIONNAME1;
   union {
     WORD v2;
     WORD wV2;
-  } v2;
+  } DUMMYUNIONNAME2;
   union {
     WORD v3;
     WORD wV3;
-  } v3;
+  } DUMMYUNIONNAME3;
   WORD     wFlags;
 } D3DTRIANGLE, *LPD3DTRIANGLE;
 
@@ -1080,11 +1080,11 @@
   union {
     WORD v1;
     WORD wV1;
-  } v1;
+  } DUMMYUNIONNAME1;
   union {
     WORD v2;
     WORD wV2;
-  } v2;
+  } DUMMYUNIONNAME2;
 } D3DLINE, *LPD3DLINE;
 
 typedef struct _D3DSPAN {