Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11nobj.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 Netscape specific PKCS #11 objects (CRLs, Trust objects,
  * etc).
  */
 
 #include "secport.h"
 #include "seccomon.h"
@@ skipping 15 matching lines @@
 #include "pki3hack.h"
 #include "dev3hack.h" 
 
 #include "devm.h" 
 #include "pki.h"
 #include "pkim.h" 
 
 extern const NSSError NSS_ERROR_NOT_FOUND;
 
 CK_TRUST
-pk11_GetTrustField(PK11SlotInfo *slot, PRArenaPool *arena, 
+pk11_GetTrustField(PK11SlotInfo *slot, PLArenaPool *arena,
                    CK_OBJECT_HANDLE id, CK_ATTRIBUTE_TYPE type)
 {
   CK_TRUST rv = 0;
   SECItem item;
 
   item.data = NULL;
   item.len = 0;
 
   if( SECSuccess == PK11_ReadAttribute(slot, id, type, arena, &item) ) {
     PORT_Assert(item.len == sizeof(CK_TRUST));
     PORT_Memcpy(&rv, item.data, sizeof(CK_TRUST));
     /* Damn, is there an endian problem here? */
     return rv;
   }
 
   return 0;
 }
 
 PRBool
 pk11_HandleTrustObject(PK11SlotInfo *slot, CERTCertificate *cert, CERTCertTrust *trust)
 {
-  PRArenaPool *arena;
+  PLArenaPool *arena;
 
   CK_ATTRIBUTE tobjTemplate[] = {
     { CKA_CLASS, NULL, 0 },
     { CKA_CERT_SHA1_HASH, NULL, 0 },
   };
 
   CK_OBJECT_CLASS tobjc = CKO_NETSCAPE_TRUST;
   CK_OBJECT_HANDLE tobjID;
   unsigned char sha1_hash[SHA1_LENGTH];
 
@@ skipping 643 matching lines @@
     return SECSuccess;
 }
 
 
 CERTSignedCrl * crl_storeCRL (PK11SlotInfo *slot,char *url,
                   CERTSignedCrl *newCrl, SECItem *derCrl, int type);
 
 /* import the CRL into the token */
 
 CERTSignedCrl* PK11_ImportCRL(PK11SlotInfo * slot, SECItem *derCRL, char *url,
-    int type, void *wincx, PRInt32 importOptions, PRArenaPool* arena,
+    int type, void *wincx, PRInt32 importOptions, PLArenaPool* arena,
     PRInt32 decodeoptions)
 {
     CERTSignedCrl *newCrl, *crl;
     SECStatus rv;
     CERTCertificate *caCert = NULL;
 
     newCrl = crl = NULL;
 
     do {
         newCrl = CERT_DecodeDERCrlWithFlags(arena, derCRL, type,
@@ skipping 43 matching lines @@
     } while (0);
 
     if (crl == NULL) {
         SEC_DestroyCrl (newCrl);
     }
     if (caCert) {
         CERT_DestroyCertificate(caCert);
     }
     return (crl);
 }