Bug 436430: NSS public headers should not use NSPR 1.0 compatibility types
and macros. Replaced PRArenaPool by PLArenaPool and int64 by PRTime. The patch is generated by Nelson Bolyard <nelson@bolyard.com>. r=wtc Modified Files: certdb/cert.h certdb/certdb.h certdb/certt.h certhigh/ocsp.h cryptohi/cryptohi.h cryptohi/keyhi.h cryptohi/keythi.h freebl/blapit.h pk11wrap/pk11priv.h pk11wrap/pk11pub.h pk11wrap/secmodt.h pkcs12/p12.h pkcs12/p12t.h pkcs12/pkcs12t.h pkcs7/pkcs7t.h pkcs7/secpkcs7.h smime/cms.h util/nssb64.h util/secasn1.h util/secder.h util/secdig.h util/secitem.h util/secoid.h git-svn-id: svn://10.0.0.236/trunk@255477 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -69,7 +69,7 @@ typedef struct PK11GenericObjectStr PK11GenericObject;
|
||||
typedef void (*PK11FreeDataFunc)(void *);
|
||||
|
||||
struct SECMODModuleStr {
|
||||
PRArenaPool *arena;
|
||||
PLArenaPool *arena;
|
||||
PRBool internal; /* true of internally linked modules, false
|
||||
* for the loaded modules */
|
||||
PRBool loaded; /* Set to true if module has been loaded */
|
||||
@@ -489,7 +489,7 @@ struct PK11MergeLogNodeStr {
|
||||
struct PK11MergeLogStr {
|
||||
PK11MergeLogNode *head;
|
||||
PK11MergeLogNode *tail;
|
||||
PRArenaPool *arena;
|
||||
PLArenaPool *arena;
|
||||
int version;
|
||||
unsigned long reserved1;
|
||||
unsigned long reserved2;
|
||||
|
||||
Reference in New Issue
Block a user