Bug 1026129: Update to NSPR_4_10_7_BETA2.

This commit is contained in:
Wan-Teh Chang 2014-06-24 10:45:50 -07:00
parent b04abaafbc
commit e4d9d6c5d9
4 changed files with 4 additions and 7 deletions

View File

@ -1 +1 @@
NSPR_4_10_7_BETA1
NSPR_4_10_7_BETA2

View File

@ -10,3 +10,4 @@
*/
#error "Do not include this header file."

View File

@ -81,10 +81,7 @@ 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);
#include <intrin.h>
#ifdef _MSC_VER
#pragma intrinsic(_InterlockedIncrement)

View File

@ -15,8 +15,7 @@ PR_BEGIN_EXTERN_C
*/
#if defined(_WIN32) && (_MSC_VER >= 1300) && \
(defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM))
unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask);
unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask);
# include <intrin.h>
# pragma intrinsic(_BitScanForward,_BitScanReverse)
__forceinline static int __prBitScanForward32(unsigned int val)
{