From 854c27dd8dc1b54e53291d671930c761eac46f8f Mon Sep 17 00:00:00 2001 From: Brandon Sneed Date: Wed, 25 Jun 2008 20:53:31 +0000 Subject: [PATCH] 2008-06-25 Brandon Sneed * include/winbase.h (InterlockedIncrement, InterlockedDecrement, InterlockedCompareExchange, InterlockedExchange, InterlockedCompareExchangePointer, InterlockedExchangeAdd, InterlockedExchangePointer): Modified from PLONG to LONG volatile *. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/winbase.h | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6af07eaa1..e5ba09bf1 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2008-06-25 Brandon Sneed + + * include/winbase.h (InterlockedIncrement, InterlockedDecrement, + InterlockedCompareExchange, InterlockedExchange, + InterlockedCompareExchangePointer, InterlockedExchangeAdd, + InterlockedExchangePointer): Modified from PLONG to LONG volatile *. + 2008-06-20 Danny Smith * lib/ddk/hal.def (HalTranslateBusAddress): Correct suffix. diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index 16f7fcbfb..3d3790803 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1660,20 +1660,20 @@ WINBASEAPI VOID WINAPI InitializeSListHead(PSLIST_HEADER); #endif #ifndef __INTERLOCKED_DECLARED #define __INTERLOCKED_DECLARED -LONG WINAPI InterlockedCompareExchange(LPLONG,LONG,LONG); +LONG WINAPI InterlockedCompareExchange(LONG volatile *,LONG,LONG); /* PVOID WINAPI InterlockedCompareExchangePointer(PVOID*,PVOID,PVOID); */ #define InterlockedCompareExchangePointer(d,e,c) \ - (PVOID)InterlockedCompareExchange((LPLONG)(d),(LONG)(e),(LONG)(c)) -LONG WINAPI InterlockedDecrement(LPLONG); -LONG WINAPI InterlockedExchange(LPLONG,LONG); + (PVOID)InterlockedCompareExchange((LONG volatile *)(d),(LONG)(e),(LONG)(c)) +LONG WINAPI InterlockedDecrement(LONG volatile *); +LONG WINAPI InterlockedExchange(LONG volatile *,LONG); /* PVOID WINAPI InterlockedExchangePointer(PVOID*,PVOID); */ #define InterlockedExchangePointer(t,v) \ - (PVOID)InterlockedExchange((LPLONG)(t),(LONG)(v)) -LONG WINAPI InterlockedExchangeAdd(LPLONG,LONG); + (PVOID)InterlockedExchange((LONG volatile *)(t),(LONG)(v)) +LONG WINAPI InterlockedExchangeAdd(LONG volatile *,LONG); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedFlushSList(PSLIST_HEADER); #endif -LONG WINAPI InterlockedIncrement(LPLONG); +LONG WINAPI InterlockedIncrement(LONG volatile *); #if (_WIN32_WINNT >= 0x0501) PSLIST_ENTRY WINAPI InterlockedPopEntrySList(PSLIST_HEADER); PSLIST_ENTRY WINAPI InterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY);