Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/pk11akey.c

Index: nss/lib/pk11wrap/pk11akey.c
===================================================================
--- nss/lib/pk11wrap/pk11akey.c	(revision 203524)
+++ nss/lib/pk11wrap/pk11akey.c	(working copy)
@@ -214,7 +214,7 @@
  * take an attribute and copy it into a secitem
  */
 static CK_RV
-pk11_Attr2SecItem(PRArenaPool *arena, const CK_ATTRIBUTE *attr, SECItem *item) 
+pk11_Attr2SecItem(PLArenaPool *arena, const CK_ATTRIBUTE *attr, SECItem *item)
 {
     item->data = NULL;
 
@@ -244,7 +244,7 @@
  * Point length = (Roundup(curveLenInBits/8)*2+1)
  */
 static int
-pk11_get_EC_PointLenInBytes(PRArenaPool *arena, const SECItem *ecParams)
+pk11_get_EC_PointLenInBytes(PLArenaPool *arena, const SECItem *ecParams)
 {
    SECItem oid;
    SECOidTag tag;
@@ -356,7 +356,7 @@
  * the passed in arena.
  */
 static CK_RV
-pk11_get_Decoded_ECPoint(PRArenaPool *arena, const SECItem *ecParams, 
+pk11_get_Decoded_ECPoint(PLArenaPool *arena, const SECItem *ecParams,
 	const CK_ATTRIBUTE *ecPoint, SECItem *publicKeyValue)
 {
     SECItem encodedPublicValue;
@@ -536,8 +536,8 @@
 PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id)
 {
     CK_OBJECT_CLASS keyClass = CKO_PUBLIC_KEY;
-    PRArenaPool *arena;
-    PRArenaPool *tmp_arena;
+    PLArenaPool *arena;
+    PLArenaPool *tmp_arena;
     SECKEYPublicKey *pubKey;
     int templateCount = 0;
     CK_KEY_TYPE pk11KeyType;
@@ -720,7 +720,7 @@
 PK11_MakePrivKey(PK11SlotInfo *slot, KeyType keyType, 
 			PRBool isTemp, CK_OBJECT_HANDLE privID, void *wincx)
 {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     SECKEYPrivateKey *privKey;
     PRBool isPrivate;
     SECStatus rv;
@@ -866,7 +866,7 @@
     CK_BBOOL ckfalse = CK_FALSE;
     CK_ATTRIBUTE *attrs = NULL, *ap;
     const int templateSize = sizeof(privTemplate)/sizeof(privTemplate[0]);
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     CK_OBJECT_HANDLE objectID;
     int i, count = 0;
     int extra_count = 0;
@@ -1502,7 +1502,7 @@
     SECKEYPublicKey *pubk;
     SECItem pkData;
     SECStatus rv;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
 
     pkData.data = keyData;
     pkData.len = length;
@@ -1716,7 +1716,7 @@
    void             *wincx)     /* context for password callback ? */
 {
     SECKEYEncryptedPrivateKeyInfo *epki      = NULL;
-    PRArenaPool                   *arena     = NULL;
+    PLArenaPool                   *arena     = NULL;
     SECAlgorithmID                *algid;
     SECOidTag			  pbeAlgTag = SEC_OID_UNKNOWN;
     SECItem                       *crypto_param = NULL;
@@ -1922,7 +1922,7 @@
 	{ CKA_BASE, NULL, 0 },
     };
     int pTemplateLen = sizeof(pTemplate)/sizeof(pTemplate[0]);
-    PRArenaPool *arena = NULL;
+    PLArenaPool *arena = NULL;
     SECKEYPQGParams *params;
     CK_RV crv;