Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/dev/devslot.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 17 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: devslot.c,v $ $Revision: 1.26 $ $Date: 2010/01/08 02:00:58 $";
+static const char CVS_ID[] = "@(#) $RCSfile: devslot.c,v $ $Revision: 1.27 $ $Date: 2010/04/03 18:27:30 $";
 #endif /* DEBUG */
 
 #include "pkcs11.h"
 
 #ifndef DEVM_H
 #include "devm.h"
 #endif /* DEVM_H */
 
 #ifndef CKHELPER_H
 #include "ckhelper.h"
@@ skipping 14 matching lines @@
 
 /* The flags needed to open a read-only session. */
 static const CK_FLAGS s_ck_readonly_flags = CKF_SERIAL_SESSION;
 
 NSS_IMPLEMENT PRStatus
 nssSlot_Destroy (
   NSSSlot *slot
 )
 {
     if (slot) {
-        if (PR_AtomicDecrement(&slot->base.refCount) == 0) {
+        if (PR_ATOMIC_DECREMENT(&slot->base.refCount) == 0) {
             PZ_DestroyLock(slot->base.lock);
             return nssArena_Destroy(slot->base.arena);
         }
     }
     return PR_SUCCESS;
 }
 
 void
 nssSlot_EnterMonitor(NSSSlot *slot)
 {
@@ skipping 16 matching lines @@
 )
 {
     (void)nssSlot_Destroy(slot);
 }
 
 NSS_IMPLEMENT NSSSlot *
 nssSlot_AddRef (
   NSSSlot *slot
 )
 {
-    PR_AtomicIncrement(&slot->base.refCount);
+    PR_ATOMIC_INCREMENT(&slot->base.refCount);
     return slot;
 }
 
 NSS_IMPLEMENT NSSUTF8 *
 nssSlot_GetName (
   NSSSlot *slot
 )
 {
     return slot->base.name;
 }
@@ skipping 166 matching lines @@
 }
 
 NSS_EXTERN PRBool
 nssSession_IsReadWrite (
   nssSession *s
 )
 {
     return s->isRW;
 }