Update NSS to NSS_3_16_RC0.

nss/lib/pk11wrap/pk11slot.c

 /* 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/. */
 /*
  * Deal with PKCS #11 Slots.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 930 matching lines @@
 
     return;
 }
 
 
 /*
  * update a slot to its new attribute according to the slot list
  * returns: SECSuccess if nothing to do or add/delete is successful
  */
 SECStatus
-PK11_UpdateSlotAttribute(PK11SlotInfo *slot, PK11DefaultArrayEntry *entry,
-                        PRBool add)  
-                        /* add: PR_TRUE if want to turn on */
+PK11_UpdateSlotAttribute(PK11SlotInfo *slot,
+                         const PK11DefaultArrayEntry *entry,
+                         PRBool add)
+                         /* add: PR_TRUE if want to turn on */
 {
     SECStatus result = SECSuccess;
     PK11SlotList *slotList = PK11_GetSlotList(entry->mechanism);
 
     if (add) { /* trying to turn on a mechanism */
                  
         /* turn on the default flag in the slot */
         slot->defaultFlags |= entry->flag;
         
         /* add this slot to the list */
@@ skipping 1425 matching lines @@
                 first_time_set = PR_TRUE;
             }
             if ((interval-first_time) > timeout) {
                 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved;
             }
         }
         PR_Sleep(latency);
    }
    return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent;
 }