From 47d7f960616fc50f16ad6ed162ffdc62c481ab08 Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Wed, 10 Dec 2008 22:48:41 +0000 Subject: [PATCH] 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 . 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 --- mozilla/security/nss/lib/softoken/secmodt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/security/nss/lib/softoken/secmodt.h b/mozilla/security/nss/lib/softoken/secmodt.h index 106117de883..0d11f221510 100644 --- a/mozilla/security/nss/lib/softoken/secmodt.h +++ b/mozilla/security/nss/lib/softoken/secmodt.h @@ -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;