commit 27a0ced6e11737b2e9c32bd2ea2e688d1a8fc39d
author Bertho Stultiens <bertho@panter.soci.aau.dk> Sun Feb 14 09:41:42 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Feb 14 09:41:42 1999 +0000
tree ff49017de85432d79b944d21d90245b4810a262b
parent 779352b579c5451f8ed052a81cd01aa0bcd79166

Change a couple of names that would conflict after all 32[AW] suffixes
are removed. Structures defined in both mmreg.h and mmsystem.h are
protected with #ifdef:s as in MS' headers.

include/msacmdrv.h

diff --git a/include/msacmdrv.h b/include/msacmdrv.h
index 91e564e..86dc34a 100644
--- a/include/msacmdrv.h
+++ b/include/msacmdrv.h
@@ -89,9 +89,9 @@
 typedef struct _ACMDRVSTREAMINSTANCE16
 {
   DWORD            cbStruct;
-  LPWAVEFORMATEX16 pwfxSrc;
-  LPWAVEFORMATEX16 pwfxDst;
-  LPWAVEFILTER16   pwfltr;
+  LPWAVEFORMATEX   pwfxSrc;
+  LPWAVEFORMATEX   pwfxDst;
+  LPWAVEFILTER     pwfltr;
   DWORD            dwCallback;
   DWORD            dwInstance;
   DWORD            fdwOpen;
@@ -103,9 +103,9 @@
 typedef struct _ACMDRVSTREAMINSTANCE32
 {
   DWORD           cbStruct;
-  PWAVEFORMATEX32 pwfxSrc;
-  PWAVEFORMATEX32 pwfxDst;
-  PWAVEFILTER32   pwfltr;
+  PWAVEFORMATEX   pwfxSrc;
+  PWAVEFORMATEX   pwfxDst;
+  PWAVEFILTER     pwfltr;
   DWORD           dwCallback;
   DWORD           dwInstance;
   DWORD           fdwOpen;
@@ -184,9 +184,9 @@
 {
   DWORD            cbStruct;
   DWORD            fdwSuggest;
-  LPWAVEFORMATEX16 pwfxSrc;
+  LPWAVEFORMATEX   pwfxSrc;
   DWORD            cbwfxSrc;
-  LPWAVEFORMATEX16 pwfxDst;
+  LPWAVEFORMATEX   pwfxDst;
   DWORD            cbwfxDst;
 } ACMDRVFORMATSUGGEST16, *NPACMDRVFORMATSUGGEST, *LPACMDRVFORMATSUGGEST;
 
@@ -194,9 +194,9 @@
 {
   DWORD           cbStruct;
   DWORD           fdwSuggest;
-  PWAVEFORMATEX32 pwfxSrc;
+  PWAVEFORMATEX   pwfxSrc;
   DWORD           cbwfxSrc;
-  PWAVEFORMATEX32 pwfxDst;
+  PWAVEFORMATEX   pwfxDst;
   DWORD           cbwfxDst;
 } ACMDRVFORMATSUGGEST32, *PACMDRVFORMATSUGGEST32;