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/winbase.h

diff --git a/include/winbase.h b/include/winbase.h
index da444b4..a4c8ec1 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1397,6 +1397,8 @@
 BOOL32      WINAPI FlushViewOfFile(LPCVOID, DWORD);
 DWORD       WINAPI FormatMessage32A(DWORD,LPCVOID,DWORD,DWORD,LPSTR,
 				    DWORD,LPDWORD);
+DWORD       WINAPI FormatMessage32W(DWORD,LPCVOID,DWORD,DWORD,LPWSTR,
+				    DWORD,LPDWORD);
 #define     FormatMessage WINELIB_NAME_AW(FormatMessage)
 BOOL32      WINAPI FreeConsole(void);
 BOOL32      WINAPI FreeEnvironmentStrings32A(LPSTR);