2009-04-04 Ozkan Sezer <sezeroz@gmail.com> * d3d8types.h: Added missing DUMMYUNIONNAME1 macro. * d3d9types.h: Likewise. * d3dhal.h: Likewise. * d3dtypes.h: Likewise. * ddrawi.h: Likewise. * dinput.h: Likewise. * dplay.h: Likewise. * dplobby.h: Likewise. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@718 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog index e47bc7d..4befae3 100644 --- a/mingw-w64-headers/direct-x/ChangeLog +++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -28,6 +28,14 @@ 7e34c708c1b3bdbb7d4921c1153403a8d8840b29), and fix D3DXAssembleShaderFromFileA/W prototypes (wine git 3d962e27ed69829645f3c8f99c17087f92d89e01). + * d3d8types.h: Added missing DUMMYUNIONNAME1 macro. + * d3d9types.h: Likewise. + * d3dhal.h: Likewise. + * d3dtypes.h: Likewise. + * ddrawi.h: Likewise. + * dinput.h: Likewise. + * dplay.h: Likewise. + * dplobby.h: Likewise. 2009-02-20 Kai Tietz <kai.tietz@onevision.com>
diff --git a/mingw-w64-headers/direct-x/include/d3d8types.h b/mingw-w64-headers/direct-x/include/d3d8types.h index 9374ec3..7573ab1 100644 --- a/mingw-w64-headers/direct-x/include/d3d8types.h +++ b/mingw-w64-headers/direct-x/include/d3d8types.h
@@ -22,12 +22,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/d3d9types.h b/mingw-w64-headers/direct-x/include/d3d9types.h index 961d959..832915c 100644 --- a/mingw-w64-headers/direct-x/include/d3d9types.h +++ b/mingw-w64-headers/direct-x/include/d3d9types.h
@@ -24,12 +24,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/d3dhal.h b/mingw-w64-headers/direct-x/include/d3dhal.h index f773d9e..28d8ae9 100644 --- a/mingw-w64-headers/direct-x/include/d3dhal.h +++ b/mingw-w64-headers/direct-x/include/d3dhal.h
@@ -25,12 +25,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/d3dtypes.h b/mingw-w64-headers/direct-x/include/d3dtypes.h index a1d33a9..e1654c2 100644 --- a/mingw-w64-headers/direct-x/include/d3dtypes.h +++ b/mingw-w64-headers/direct-x/include/d3dtypes.h
@@ -28,12 +28,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/ddrawi.h b/mingw-w64-headers/direct-x/include/ddrawi.h index 9886b5d..d8224aa 100644 --- a/mingw-w64-headers/direct-x/include/ddrawi.h +++ b/mingw-w64-headers/direct-x/include/ddrawi.h
@@ -25,12 +25,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/dinput.h b/mingw-w64-headers/direct-x/include/dinput.h index 8820846..4309513 100644 --- a/mingw-w64-headers/direct-x/include/dinput.h +++ b/mingw-w64-headers/direct-x/include/dinput.h
@@ -25,12 +25,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/dplay.h b/mingw-w64-headers/direct-x/include/dplay.h index 681a2e2..f4a382d 100644 --- a/mingw-w64-headers/direct-x/include/dplay.h +++ b/mingw-w64-headers/direct-x/include/dplay.h
@@ -24,12 +24,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4
diff --git a/mingw-w64-headers/direct-x/include/dplobby.h b/mingw-w64-headers/direct-x/include/dplobby.h index 06579b0..78225bd 100644 --- a/mingw-w64-headers/direct-x/include/dplobby.h +++ b/mingw-w64-headers/direct-x/include/dplobby.h
@@ -23,12 +23,14 @@ #ifndef DUMMYUNIONNAME #ifdef NONAMELESSUNION #define DUMMYUNIONNAME u +#define DUMMYUNIONNAME1 u1 #define DUMMYUNIONNAME2 u2 #define DUMMYUNIONNAME3 u3 #define DUMMYUNIONNAME4 u4 #define DUMMYUNIONNAME5 u5 #else #define DUMMYUNIONNAME +#define DUMMYUNIONNAME1 #define DUMMYUNIONNAME2 #define DUMMYUNIONNAME3 #define DUMMYUNIONNAME4