mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 599324, landing NSPR_4_8_7_BETA2, includes fix for bustage from ealier landing (bug 617903), a=blocking2.0-beta8+
This commit is contained in:
parent
4e7a985fd2
commit
f19ca3c7ad
@ -1 +1 @@
|
||||
NSPR_4_8_7_BETA1
|
||||
NSPR_4_8_7_BETA2
|
||||
|
@ -42,3 +42,4 @@
|
||||
*/
|
||||
|
||||
#error "Do not include this header file."
|
||||
|
||||
|
@ -113,6 +113,11 @@ NSPR_API(PRInt32) PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
|
||||
#if defined(_WIN32) && !defined(_WIN32_WCE) && \
|
||||
(!defined(_MSC_VER) || (_MSC_VER >= 1310))
|
||||
|
||||
long __cdecl _InterlockedIncrement(long volatile *Addend);
|
||||
long __cdecl _InterlockedDecrement(long volatile *Addend);
|
||||
long __cdecl _InterlockedExchange(long volatile *Target, long Value);
|
||||
long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value);
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma intrinsic(_InterlockedIncrement)
|
||||
#pragma intrinsic(_InterlockedDecrement)
|
||||
@ -120,11 +125,6 @@ NSPR_API(PRInt32) PR_AtomicAdd(PRInt32 *ptr, PRInt32 val);
|
||||
#pragma intrinsic(_InterlockedExchangeAdd)
|
||||
#endif
|
||||
|
||||
long __cdecl _InterlockedIncrement(long volatile *Addend);
|
||||
long __cdecl _InterlockedDecrement(long volatile *Addend);
|
||||
long __cdecl _InterlockedExchange(long volatile *Target, long Value);
|
||||
long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value);
|
||||
|
||||
#define PR_ATOMIC_INCREMENT(val) _InterlockedIncrement((long volatile *)(val))
|
||||
#define PR_ATOMIC_DECREMENT(val) _InterlockedDecrement((long volatile *)(val))
|
||||
#define PR_ATOMIC_SET(val, newval) \
|
||||
|
0
nsprpub/pr/include/prvrsion.h
Normal file → Executable file
0
nsprpub/pr/include/prvrsion.h
Normal file → Executable file
0
nsprpub/pr/src/cplus/rcthread.cpp
Normal file → Executable file
0
nsprpub/pr/src/cplus/rcthread.cpp
Normal file → Executable file
0
nsprpub/pr/tests/poll_er.c
Normal file → Executable file
0
nsprpub/pr/tests/poll_er.c
Normal file → Executable file
0
nsprpub/pr/tests/selct_er.c
Normal file → Executable file
0
nsprpub/pr/tests/selct_er.c
Normal file → Executable file
Loading…
Reference in New Issue
Block a user