Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pkcs7/p7local.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/. */
 
 /*
  * Support routines for PKCS7 implementation, none of which are exported.
  * This file should only contain things that are needed by both the
  * encoding/creation side *and* the decoding/decryption side.  Anything
  * else should be static routines in the appropriate file.
  */
@@ skipping 122 matching lines @@
  *
  * XXX This interface, or one similar, would be really nice available
  * in general...  I tried to keep the pkcs7-specific stuff (mostly
  * having to do with padding) out of here.
  *
  * XXX Once both are working, it might be nice to combine this and the
  * function above (for starting up decryption) into one routine, and just
  * have two simple cover functions which call it. 
  */
 sec_PKCS7CipherObject *
-sec_PKCS7CreateEncryptObject (PRArenaPool *poolp, PK11SymKey *key,
+sec_PKCS7CreateEncryptObject (PLArenaPool *poolp, PK11SymKey *key,
                               SECOidTag algtag, SECAlgorithmID *algid)
 {
     sec_PKCS7CipherObject *result;
     void *ciphercx;
     SECStatus rv;
     CK_MECHANISM_TYPE cryptoMechType;
     PK11SlotInfo *slot;
     SECItem *param = NULL;
     PRBool needToEncodeAlgid = PR_FALSE;
 
@@ skipping 762 matching lines @@
 };
 
 /*
  * If you are wondering why this routine does not reorder the attributes
  * first, and might be tempted to make it do so, see the comment by the
  * call to ReorderAttributes in p7encode.c.  (Or, see who else calls this
  * and think long and hard about the implications of making it always
  * do the reordering.)
  */
 SECItem *
-sec_PKCS7EncodeAttributes (PRArenaPool *poolp, SECItem *dest, void *src)
+sec_PKCS7EncodeAttributes (PLArenaPool *poolp, SECItem *dest, void *src)
 {
     return SEC_ASN1EncodeItem (poolp, dest, src,
                                sec_pkcs7_set_of_attribute_template);
 }
 
 /*
  * Make sure that the order of the attributes guarantees valid DER
  * (which must be in lexigraphically ascending order for a SET OF);
  * if reordering is necessary it will be done in place (in attrs).
  */
 SECStatus
 sec_PKCS7ReorderAttributes (SEC_PKCS7Attribute **attrs)
 {
-    PRArenaPool *poolp;
+    PLArenaPool *poolp;
     int num_attrs, i, pass, besti;
     unsigned int j;
     SECItem **enc_attrs;
     SEC_PKCS7Attribute **new_attrs;
 
     /*
      * I think we should not be called with NULL.  But if we are,
      * call it a success anyway, because the order *is* okay.
      */
     PORT_Assert (attrs != NULL);
@@ skipping 359 matching lines @@
         theTemplate = SEC_PointerToPKCS7EncryptedDataTemplate;
         break;
     }
     return theTemplate;
 }
 
 /*
  * End of templates.  Do not add stuff after this; put new code
  * up above the start of the template definitions.
  */