Bug 1026129: Update to NSPR_4_10_7_BETA2.
authorWan-Teh Chang <wtc@google.com>
Tue, 24 Jun 2014 10:45:50 -0700
changeset 190513 b8ed1bc7528b1cad028ae531f8f2e8f08715a19a
parent 190512 f9793892fc81fd15392eb4d081dc13764bfc4d61
child 190514 bd0a35e183157e90843eb267ed039145e852d721
push id45327
push userwtc@google.com
push dateTue, 24 Jun 2014 17:46:01 +0000
treeherdermozilla-inbound@b8ed1bc7528b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1026129
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1026129: Update to NSPR_4_10_7_BETA2.
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/pratom.h
nsprpub/pr/include/prbit.h
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_10_7_BETA1
+NSPR_4_10_7_BETA2
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,8 +5,9 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
+
--- a/nsprpub/pr/include/pratom.h
+++ b/nsprpub/pr/include/pratom.h
@@ -76,20 +76,17 @@ NSPR_API(PRInt32)	PR_AtomicAdd(PRInt32 *
 **    where the PR_AtomicXXX functions are truly atomic (i.e., where the
 **    configuration macro _PR_HAVE_ATOMIC_OPS is defined).  Otherwise,
 **    the macros and functions won't be compatible and can't be used
 **    interchangeably.
 */
 #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)
 #pragma intrinsic(_InterlockedDecrement)
 #pragma intrinsic(_InterlockedExchange)
 #pragma intrinsic(_InterlockedExchangeAdd)
 #endif
 
--- a/nsprpub/pr/include/prbit.h
+++ b/nsprpub/pr/include/prbit.h
@@ -10,18 +10,17 @@
 PR_BEGIN_EXTERN_C
 
 /*
 ** Replace compare/jump/add/shift sequence with compiler built-in/intrinsic
 ** functions.
 */
 #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)
   { 
     unsigned long idx;
     _BitScanForward(&idx, (unsigned long)val);
     return( (int)idx );
   }
   __forceinline static int __prBitScanReverse32(unsigned int val)