From 40d81a2ba531f146e36b78b6bbddeb8fde445f1b Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <wtc@google.com>
Date: Tue, 24 Jun 2014 10:45:50 -0700
Subject: [PATCH] Bug 1026129: Update to NSPR_4_10_7_BETA2.

---
 nsprpub/TAG-INFO            | 2 +-
 nsprpub/config/prdepend.h   | 1 +
 nsprpub/pr/include/pratom.h | 5 +----
 nsprpub/pr/include/prbit.h  | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO
index 488171cfcd92..63fbbb8ea4a0 100644
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1 +1 @@
-NSPR_4_10_7_BETA1
+NSPR_4_10_7_BETA2
diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h
index e49e92677e3e..6c66b37ca0fc 100644
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -10,3 +10,4 @@
  */
 
 #error "Do not include this header file."
+
diff --git a/nsprpub/pr/include/pratom.h b/nsprpub/pr/include/pratom.h
index 3b2fe5c64ca0..9dbe0fad3393 100644
--- a/nsprpub/pr/include/pratom.h
+++ b/nsprpub/pr/include/pratom.h
@@ -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)
diff --git a/nsprpub/pr/include/prbit.h b/nsprpub/pr/include/prbit.h
index de8375088b48..0434fc683820 100644
--- a/nsprpub/pr/include/prbit.h
+++ b/nsprpub/pr/include/prbit.h
@@ -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)
   {