Bug 599324, landing NSPR_4_8_7_BETA2, includes fix for bustage from ealier landing (bug 617903), a=blocking2.0-beta8+
authorKai Engert <kaie@kuix.de>
Thu, 09 Dec 2010 22:54:21 +0100
changeset 59029 eeb76ce515d9c393a3d181622b63b09def96ee7f
parent 59028 f971ad6ed5a5c5ba00e745ae75b78b39241496b2
child 59030 4df7a503fcb3791902271acb91c473529ac01ff4
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersblocking2
bugs599324, 617903
milestone2.0b8pre
Bug 599324, landing NSPR_4_8_7_BETA2, includes fix for bustage from ealier landing (bug 617903), a=blocking2.0-beta8+
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/pr/include/pratom.h
nsprpub/pr/include/prvrsion.h
nsprpub/pr/src/cplus/rcthread.cpp
nsprpub/pr/tests/poll_er.c
nsprpub/pr/tests/selct_er.c
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_8_7_BETA1
+NSPR_4_8_7_BETA2
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -37,8 +37,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
@@ -108,28 +108,28 @@ 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);
+
 #ifdef _MSC_VER
 #pragma intrinsic(_InterlockedIncrement)
 #pragma intrinsic(_InterlockedDecrement)
 #pragma intrinsic(_InterlockedExchange)
 #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) \
         _InterlockedExchange((long volatile *)(val), (long)(newval))
 #define PR_ATOMIC_ADD(ptr, val) \
         (_InterlockedExchangeAdd((long volatile *)(ptr), (long)(val)) + (val))
 
 #elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && \
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755
old mode 100644
new mode 100755