Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11obj.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/. */
 /*
  * This file manages object type indepentent functions.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
 #include "secmodti.h"
@@ skipping 66 matching lines @@
     return rv;
 }
 
 /*
  * Read in a single attribute into a SECItem. Allocate space for it with 
  * PORT_Alloc unless an arena is supplied. In the latter case use the arena
  * to allocate the space.
  */
 SECStatus
 PK11_ReadAttribute(PK11SlotInfo *slot, CK_OBJECT_HANDLE id,
-         CK_ATTRIBUTE_TYPE type, PRArenaPool *arena, SECItem *result) {
+         CK_ATTRIBUTE_TYPE type, PLArenaPool *arena, SECItem *result) {
     CK_ATTRIBUTE attr = { 0, NULL, 0 };
     CK_RV crv;
 
     attr.type = type;
 
     PK11_EnterSlotMonitor(slot);
     crv = PK11_GETTAB(slot)->C_GetAttributeValue(slot->session,id,&attr,1);
     if (crv != CKR_OK) {
         PK11_ExitSlotMonitor(slot);
         PORT_SetError(PK11_MapError(crv));
@@ skipping 68 matching lines @@
     }
 
     return ckvalue;
 }
 
 /*
  * returns a full list of attributes. Allocate space for them. If an arena is
  * provided, allocate space out of the arena.
  */
 CK_RV
-PK11_GetAttributes(PRArenaPool *arena,PK11SlotInfo *slot,
+PK11_GetAttributes(PLArenaPool *arena,PK11SlotInfo *slot,
                         CK_OBJECT_HANDLE obj,CK_ATTRIBUTE *attr, int count)
 {
     int i;
     /* make pedantic happy... note that it's only used arena != NULL */ 
     void *mark = NULL; 
     CK_RV crv;
     PORT_Assert(slot->session != CK_INVALID_SESSION);
     if (slot->session == CK_INVALID_SESSION)
         return CKR_SESSION_HANDLE_INVALID;
 
@@ skipping 1542 matching lines @@
     CK_ATTRIBUTE theTemplate[] = {
         { CKA_ID, NULL, 0 },
         { CKA_CLASS, NULL, 0 }
     };
     /* if you change the array, change the variable below as well */
     CK_ATTRIBUTE *keyclass = &theTemplate[1];
     int tsize = sizeof(theTemplate)/sizeof(theTemplate[0]);
     /* if you change the array, change the variable below as well */
     CK_OBJECT_HANDLE peerID;
     CK_OBJECT_HANDLE parent;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     CK_RV crv;
 
     /* now we need to create space for the public key */
     arena = PORT_NewArena( DER_DEFAULT_CHUNKSIZE);
     if (arena == NULL) return CK_INVALID_HANDLE;
 
     crv = PK11_GetAttributes(arena,slot,searchID,theTemplate,tsize);
     if (crv != CKR_OK) {
         PORT_FreeArena(arena,PR_FALSE);
         PORT_SetError( PK11_MapError(crv) );
@@ skipping 219 matching lines @@
         PORT_SetError( PK11_MapError(crv) );
         return NULL;
     }
 
     item->data = (unsigned char*) theTemplate[0].pValue;
     item->len =theTemplate[0].ulValueLen;
 
     return item;
 }