Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/pk11wrap/debug_module.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 884 matching lines @@
 int nssdbg_prof_size = sizeof(nssdbg_prof_data)/sizeof(nssdbg_prof_data[0]);
     
 
 static void nssdbg_finish_time(PRInt32 fun_number, PRIntervalTime start)
 {
     PRIntervalTime ival;
     PRIntervalTime end = PR_IntervalNow();
 
     ival = end-start;
     /* sigh, lie to PRAtomic add and say we are using signed values */
-    PR_AtomicAdd((PRInt32 *)&nssdbg_prof_data[fun_number].time, (PRInt32)ival);
+    PR_ATOMIC_ADD((PRInt32 *)&nssdbg_prof_data[fun_number].time, (PRInt32)ival);
 }
 
 static void nssdbg_start_time(PRInt32 fun_number, PRIntervalTime *start)
 {
-    PR_AtomicIncrement((PRInt32 *)&nssdbg_prof_data[fun_number].calls);
+    PR_ATOMIC_INCREMENT((PRInt32 *)&nssdbg_prof_data[fun_number].calls);
     *start = PR_IntervalNow();
 }
 
 #define COMMON_DEFINITIONS \
     CK_RV rv; \
     PRIntervalTime start
 
 CK_RV NSSDBGC_Initialize(
   CK_VOID_PTR pInitArgs
 )
@@ skipping 284 matching lines @@
 CK_RV NSSDBGC_OpenSession(
   CK_SLOT_ID            slotID,
   CK_FLAGS              flags,
   CK_VOID_PTR           pApplication,
   CK_NOTIFY             Notify,
   CK_SESSION_HANDLE_PTR phSession
 )
 {
     COMMON_DEFINITIONS;
 
-    PR_AtomicIncrement((PRInt32 *)&numOpenSessions);
+    PR_ATOMIC_INCREMENT((PRInt32 *)&numOpenSessions);
     maxOpenSessions = PR_MAX(numOpenSessions, maxOpenSessions);
     PR_LOG(modlog, 1, ("C_OpenSession"));
     PR_LOG(modlog, 3, (fmt_slotID, slotID));
     PR_LOG(modlog, 3, (fmt_flags, flags));
     PR_LOG(modlog, 3, ("  pApplication = 0x%p", pApplication));
     PR_LOG(modlog, 3, ("  Notify = 0x%x", Notify));
     PR_LOG(modlog, 3, ("  phSession = 0x%p", phSession));
     nssdbg_start_time(FUNC_C_OPENSESSION,&start);
     rv = module_functions->C_OpenSession(slotID,
                                  flags,
                                  pApplication,
                                  Notify,
                                  phSession);
     nssdbg_finish_time(FUNC_C_OPENSESSION,start);
     log_handle(4, "  *phSession = 0x%x", *phSession);
     log_rv(rv);
     return rv;
 }
 
 CK_RV NSSDBGC_CloseSession(
   CK_SESSION_HANDLE hSession
 )
 {
     COMMON_DEFINITIONS;
 
-    PR_AtomicDecrement((PRInt32 *)&numOpenSessions);
+    PR_ATOMIC_DECREMENT((PRInt32 *)&numOpenSessions);
     PR_LOG(modlog, 1, ("C_CloseSession"));
     log_handle(3, fmt_hSession, hSession);
     nssdbg_start_time(FUNC_C_CLOSESESSION,&start);
     rv = module_functions->C_CloseSession(hSession);
     nssdbg_finish_time(FUNC_C_CLOSESESSION,start);
     log_rv(rv);
     return rv;
 }
 
 CK_RV NSSDBGC_CloseAllSessions(
@@ skipping 1482 matching lines @@
     fprintf(outfile,"%25s %10d %10d%2s\n", "Totals", total_calls, 
                                                         pr_total_time, type);
     fprintf(outfile,"\n\nMaximum number of concurrent open sessions: %d\n\n",
                                                          maxOpenSessions);
     fflush (outfile);
     if (outfile != stdout) {
         fclose(outfile);
     }
 }