Update to NSS 3.15.5 and NSPR 4.10.3.

nspr/pr/src/threads/combined/prulock.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "primpl.h"
 
 #if defined(WIN95)
 /*
 ** Some local variables report warnings on Win95 because the code paths 
@@ skipping 179 matching lines @@
 {
     PRThread *me = _PR_MD_CURRENT_THREAD();
     PRIntn is;
     PRThread *t;
     PRCList *q;
 
     PR_ASSERT(me != suspendAllThread); 
     PR_ASSERT(!(me->flags & _PR_IDLE_THREAD));
     PR_ASSERT(lock != NULL);
 #ifdef _PR_GLOBAL_THREADS_ONLY 
-    PR_ASSERT(lock->owner != me);
     _PR_MD_LOCK(&lock->ilock);
+    PR_ASSERT(lock->owner == 0);
     lock->owner = me;
     return;
 #else  /* _PR_GLOBAL_THREADS_ONLY */
 
         if (_native_threads_only) {
-                PR_ASSERT(lock->owner != me);
                 _PR_MD_LOCK(&lock->ilock);
+                PR_ASSERT(lock->owner == 0);
                 lock->owner = me;
                 return;
         }
 
     if (!_PR_IS_NATIVE_THREAD(me))
         _PR_INTSOFF(is);
 
     PR_ASSERT(_PR_IS_NATIVE_THREAD(me) || _PR_MD_GET_INTSOFF() != 0);
 
 retry:
@@ skipping 205 matching lines @@
 #endif  /* _PR_GLOBAL_THREADS_ONLY */
 }
 
 /************************************************************************/
 /************************************************************************/
 /***********************ROUTINES FOR DCE EMULATION***********************/
 /************************************************************************/
 /************************************************************************/
 PR_IMPLEMENT(PRStatus) PRP_TryLock(PRLock *lock)
     { return (PR_TestAndLock(lock)) ? PR_SUCCESS : PR_FAILURE; }