Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/util/nssilock.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 107 matching lines @@
     PRIntervalTime  callTime,
     PRIntervalTime  heldTime,
     void            *lock,
     PRIntn          line,
     char            *file
 )  {
     PRInt32 idx;
     struct pzTrace_s *tp;
 
 RetryTrace:
-    idx = PR_AtomicIncrement( &traceIndex );
+    idx = PR_ATOMIC_INCREMENT( &traceIndex );
     while( NUM_TT_ENTRIES <= idx || op == FlushTT ) {
         if( NUM_TT_ENTRIES == idx  || op == FlushTT )  {
             int writeSize = idx * sizeof(struct pzTrace_s);
             PR_Lock(ttLock);
             PR_Write( ttfd, tt, writeSize );
             traceIndex = -1;
             PR_NotifyAllCondVar( ttCVar );
             PR_Unlock(ttLock);
             goto RetryTrace;
         } else {
@@ skipping 382 matching lines @@
 
     callTime = PR_IntervalNow();
     rc = PR_NotifyAll( mon->mon );
     callTime = PR_IntervalNow() - callTime;
     Vtrace( NotifyAll, mon->ltype, callTime, 0, mon, line, file );
     return( rc );
 } /* --- end  pz_NotifyAll() --- */
 
 #endif /* NEED_NSS_ILOCK */
 /* --- end nssilock.c --------------------------------- */