Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/pk11wrap/secmodi.h

 /* 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/. */
 /*
  * Internal header file included only by files in pkcs11 dir, or in
  * pkcs11 specific client and server files.
  */
 #ifndef _SECMODI_H_
 #define _SECMODI_H_ 1
 #include "pkcs11.h"
@@ skipping 63 matching lines @@
 /* parsing parameters */
 /* returned char * must be freed by caller with PORT_Free */
 /* children and ids are null terminated arrays which must be freed with
  * secmod_FreeChildren */
 char *secmod_ParseModuleSpecForTokens(PRBool convert,
                                       PRBool isFIPS,
                                       char *moduleSpec,
                                       char ***children, 
                                       CK_SLOT_ID **ids);
 void secmod_FreeChildren(char **children, CK_SLOT_ID *ids);
-char *secmod_MkAppendTokensList(PRArenaPool *arena, char *origModuleSpec, 
+char *secmod_MkAppendTokensList(PLArenaPool *arena, char *origModuleSpec,
                                 char *newModuleSpec, CK_SLOT_ID newID,
                                 char **children, CK_SLOT_ID *ids);
 
 
 void SECMOD_SlotDestroyModule(SECMODModule *module, PRBool fromSlot);
 CK_RV pk11_notify(CK_SESSION_HANDLE session, CK_NOTIFICATION event,
                                                          CK_VOID_PTR pdata);
 void pk11_SignedToUnsigned(CK_ATTRIBUTE *attrib);
 CK_OBJECT_HANDLE pk11_FindObjectByTemplate(PK11SlotInfo *slot,
                                         CK_ATTRIBUTE *inTemplate,int tsize);
 CK_OBJECT_HANDLE *pk11_FindObjectsByTemplate(PK11SlotInfo *slot,
                         CK_ATTRIBUTE *inTemplate,int tsize, int *objCount);
 SECStatus PK11_UpdateSlotAttribute(PK11SlotInfo *slot,
                                  PK11DefaultArrayEntry *entry, PRBool add);
 
 #define PK11_GETTAB(x) ((CK_FUNCTION_LIST_PTR)((x)->functionList))
 #define PK11_SETATTRS(x,id,v,l) (x)->type = (id); \
                 (x)->pValue=(v); (x)->ulValueLen = (l);
 SECStatus PK11_CreateNewObject(PK11SlotInfo *slot, CK_SESSION_HANDLE session,
                                const CK_ATTRIBUTE *theTemplate, int count,
                                 PRBool token, CK_OBJECT_HANDLE *objectID);
 
 SECStatus pbe_PK11AlgidToParam(SECAlgorithmID *algid,SECItem *mech);
 SECStatus PBE_PK11ParamToAlgid(SECOidTag algTag, SECItem *param, 
-                                PRArenaPool *arena, SECAlgorithmID *algId);
+                                PLArenaPool *arena, SECAlgorithmID *algId);
 
 PK11SymKey *pk11_TokenKeyGenWithFlagsAndKeyType(PK11SlotInfo *slot,
         CK_MECHANISM_TYPE type, SECItem *param, CK_KEY_TYPE keyType, 
         int keySize, SECItem *keyId, CK_FLAGS opFlags, 
         PK11AttrFlags attrFlags, void *wincx);
 
 CK_MECHANISM_TYPE pk11_GetPBECryptoMechanism(SECAlgorithmID *algid,
                    SECItem **param, SECItem *pwd, PRBool faulty3DES);
 
 
@@ skipping 45 matching lines @@
                         CK_OBJECT_HANDLE certID, CK_ATTRIBUTE *privateLabel);
 
 SECItem *pk11_GenerateNewParamWithKeyLen(CK_MECHANISM_TYPE type, int keyLen);
 SECItem *pk11_ParamFromIVWithLen(CK_MECHANISM_TYPE type, 
                                  SECItem *iv, int keyLen);
 
 SEC_END_PROTOS
 
 #endif