From 8c582a20536a0c387905b336c5d9e377926d2f8d Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Wed, 1 Aug 2012 17:38:51 +0000 Subject: [PATCH] * include/winbase.h (InterlockedDecrement): Modify declaration from LONG WINAPI to LONG __cdecl to match Microsoft documentation. (InterlockedIncrement): Ditto. (InterlockedExchange): Ditto. --- winsup/w32api/ChangeLog | 4 ++++ winsup/w32api/include/winbase.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 01c59252f..38a2df19c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -11,6 +11,10 @@ (WTSVirtualChannelRead): Ditto. (WTSVirtualChannelWrite): Ditto. * lib/wtsapi32.def (WTSVirtualChannelOpenEx@12): Add import. + * include/winbase.h (InterlockedDecrement): Modify declaration from + LONG WINAPI to LONG __cdecl to match Microsoft documentation. + (InterlockedIncrement): Ditto. + (InterlockedExchange): Ditto. 2012-07-29 Earnie Boyd diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index a61547051..aa168418b 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1846,8 +1846,8 @@ LONG WINAPI InterlockedCompareExchange(LONG volatile *,LONG,LONG); /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ #define InterlockedCompareExchangePointer(d,e,c) \ (PVOID)InterlockedCompareExchange((LONG volatile *)(d),(LONG)(e),(LONG)(c)) -LONG WINAPI InterlockedDecrement(LONG volatile *); -LONG WINAPI InterlockedExchange(LONG volatile *,LONG); +LONG __cdecl InterlockedDecrement(LONG volatile *); +LONG __cdecl InterlockedExchange(LONG volatile *,LONG); /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ #define InterlockedExchangePointer(t,v) \ (PVOID)InterlockedExchange((LONG volatile *)(t),(LONG)(v)) @@ -1855,7 +1855,7 @@ LONG WINAPI InterlockedExchangeAdd(LONG volatile *,LONG); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); #endif -LONG WINAPI InterlockedIncrement(LONG volatile *); +LONG __cdecl InterlockedIncrement(LONG volatile *); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY);