Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pkcs7/certread.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/. */
 
 #include "cert.h"
 #include "base64.h"
 #include "secitem.h"
 #include "secder.h"
 #include "secasn1.h"
 #include "secoid.h"
@@ skipping 105 matching lines @@
     return theTemplate;
 }
 
 static SECStatus
 SEC_ReadPKCS7Certs(SECItem *pkcs7Item, CERTImportCertificateFunc f, void *arg)
 {
     ContentInfo contentInfo;
     SECStatus rv;
     SECItem **certs;
     int count;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
 
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if ( arena == NULL ) {
         return SECFailure;
     }
 
     PORT_Memset(&contentInfo, 0, sizeof(contentInfo));
     rv = SEC_ASN1DecodeItem(arena, &contentInfo, ContentInfoTemplate,
                             pkcs7Item);
     if ( rv != SECSuccess ) {
@@ skipping 33 matching lines @@
     { SEC_ASN1_SEQUENCE_OF | SEC_ASN1_XTRN, 0, SEC_ASN1_SUB(SEC_AnyTemplate) }
 };
 
 static SECStatus
 SEC_ReadCertSequence(SECItem *certsItem, CERTImportCertificateFunc f, void *arg)
 {
     SECStatus rv;
     SECItem **certs;
     int count;
     SECItem **rawCerts = NULL;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     ContentInfo contentInfo;
 
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if ( arena == NULL ) {
         return SECFailure;
     }
 
     PORT_Memset(&contentInfo, 0, sizeof(contentInfo));
     rv = SEC_ASN1DecodeItem(arena, &contentInfo, ContentInfoTemplate,
                             certsItem);
@@ skipping 301 matching lines @@
     }
 
     if ( ascCert ) {
         PORT_Free(ascCert);
     }
 
     return(rv);
 }
 
 typedef struct {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     SECItem cert;
 } collect_args;
 
 static SECStatus
 collect_certs(void *arg, SECItem **certs, int numcerts)
 {
     SECStatus rv;
     collect_args *collectArgs;
     
     collectArgs = (collect_args *)arg;
@@ skipping 21 matching lines @@
     if ( rv == SECSuccess ) {
         cert = CERT_NewTempCertificate(CERT_GetDefaultCertDB(),
                                        &collectArgs.cert, NULL, 
                                        PR_FALSE, PR_TRUE);
     }
     
     PORT_FreeArena(collectArgs.arena, PR_FALSE);
     
     return(cert);
 }