Bug 599324, landing NSPR_4_8_7_BETA2, includes fix for bustage from ealier landing (bug 617903), a=blocking2.0-beta8+

nsprpub/TAG-INFO

@@ -1 +1 @@
-NSPR_4_8_7_BETA1
+NSPR_4_8_7_BETA2

nsprpub/config/prdepend.h

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

nsprpub/pr/include/pratom.h

@@ -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) \