Commit d089254c authored by Wan-Teh Chang's avatar Wan-Teh Chang
Browse files

Bug 575620: Update NSPR to NSPR_4_8_6_BETA3. Includes patches for 

bug 415563.
parent c6eb13a2

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_8_6_BETA2
 
NSPR_4_8_6_BETA3

nsprpub/config/prdepend.h

+0 −1
Original line number Diff line number Diff line
@@ -42,4 +42,3 @@ 
 */



#error "Do not include this header file."

nsprpub/pr/include/pratom.h

+4 −2
Original line number Diff line number Diff line
@@ -134,9 +134,11 @@ long __cdecl _InterlockedExchangeAdd(long volatile *Addend, long Value); 


#elif ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && \

      ((defined(DARWIN) && \

           (defined(__ppc__) || defined(__i386__))) || \

           (defined(__ppc__) || defined(__i386__) || defined(__x86_64__))) || \

       (defined(LINUX) && \

           (defined(__i386__) || defined(__ia64__) || defined(__x86_64__) || \

           ((defined(__i386__) && \

           defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)) || \

           defined(__ia64__) || defined(__x86_64__) || \

           (defined(__powerpc__) && !defined(__powerpc64__)) || \

           defined(__alpha))))

nsprpub/pr/include/prinit.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C 
** The format of the version string is

**     "<major version>.<minor version>[.<patch level>] [<Beta>]"

*/

#define PR_VERSION  "4.8.6 Beta 2"

#define PR_VERSION  "4.8.6 Beta 3"

#define PR_VMAJOR   4

#define PR_VMINOR   8

#define PR_VPATCH   6

nsprpub/pr/src/misc/prinit.c

+2 −2
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ PR_IMPLEMENT(PRStatus) PR_CallOnce( 
    if (!_pr_initialized) _PR_ImplicitInitialization();



    if (!once->initialized) {

	if (PR_AtomicSet(&once->inProgress, 1) == 0) {

	if (PR_ATOMIC_SET(&once->inProgress, 1) == 0) {

	    once->status = (*func)();

	    PR_Lock(mod_init.ml);

	    once->initialized = 1;
@@ -832,7 +832,7 @@ PR_IMPLEMENT(PRStatus) PR_CallOnceWithArg( 
    if (!_pr_initialized) _PR_ImplicitInitialization();



    if (!once->initialized) {

	if (PR_AtomicSet(&once->inProgress, 1) == 0) {

	if (PR_ATOMIC_SET(&once->inProgress, 1) == 0) {

	    once->status = (*func)(arg);

	    PR_Lock(mod_init.ml);

	    once->initialized = 1;