* dmdls.h (_DMUS_REGION): WLOOP is typedef'ed as struct _rloop in dls1.h. Changed type of WLOOP[1] from WLOOP to struct _rloop for __cplusplus compatibility. git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@2751 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/direct-x/ChangeLog b/mingw-w64-headers/direct-x/ChangeLog index a3ed323..8adb8fa 100644 --- a/mingw-w64-headers/direct-x/ChangeLog +++ b/mingw-w64-headers/direct-x/ChangeLog
@@ -1,3 +1,9 @@ +2010-07-04 Ozkan Sezer <sezeroz@gmail.com> + + * dmdls.h (_DMUS_REGION): WLOOP is typedef'ed as struct _rloop in + dls1.h. Changed type of WLOOP[1] from WLOOP to struct _rloop for + __cplusplus compatibility. + 2010-06-24 Ozkan Sezer <sezeroz@gmail.com> * d3dx9.h: Update from wine svn.
diff --git a/mingw-w64-headers/direct-x/include/dmdls.h b/mingw-w64-headers/direct-x/include/dmdls.h index 1079452..789c0d4 100644 --- a/mingw-w64-headers/direct-x/include/dmdls.h +++ b/mingw-w64-headers/direct-x/include/dmdls.h
@@ -112,13 +112,9 @@ ULONG ulFirstExtCkIdx; WAVELINK WaveLink; WSMPL WSMP; -/* WLOOP is a struct typedef, leads to - * a compiler error if __cplusplus . */ -#ifdef __cplusplus - WLOOP WWLOOP[1]; -#else - WLOOP WLOOP[1]; -#endif +/* WLOOP is typedef'ed as struct _rloop in dls1.h. Changed type of + * WLOOP[1] from WLOOP to struct _rloop for __cplusplus compat. */ + struct _rloop WLOOP[1]; }; struct _DMUS_LFOPARAMS {