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.

dlls/msacm/msacm_main.c

diff --git a/dlls/msacm/msacm_main.c b/dlls/msacm/msacm_main.c
index 206c4ce..e234d43 100644
--- a/dlls/msacm/msacm_main.c
+++ b/dlls/msacm/msacm_main.c
@@ -207,8 +207,8 @@
  *           ACMFORMATSUGGEST (MSACM.45)
  */
 MMRESULT16 WINAPI acmFormatSuggest16(
-  HACMDRIVER16 had, LPWAVEFORMATEX16 pwfxSrc, 
-  LPWAVEFORMATEX16 pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest)
+  HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, 
+  LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest)
 {
   FIXME(msacm, "(0x%04x, %p, %p, %ld, %ld): stub\n",
     had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest
@@ -283,8 +283,8 @@
  */
 MMRESULT16 WINAPI acmStreamOpen16(
   LPHACMSTREAM16 phas, HACMDRIVER16 had,
-  LPWAVEFORMATEX16 pwfxSrc, LPWAVEFORMATEX16 pwfxDst,
-  LPWAVEFILTER16 pwfltr, DWORD dwCallback,
+  LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst,
+  LPWAVEFILTER pwfltr, DWORD dwCallback,
   DWORD dwInstance, DWORD fdwOpen)
 {
   FIXME(msacm, "(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n",