From 359b2406b30bf028934a8cbdd30bb0588cf2ad6c Mon Sep 17 00:00:00 2001
From: Brian Smith <bsmith@mozilla.com>
Date: Thu, 2 May 2013 19:32:59 -0700
Subject: Bug 802430: Allow NSS to be built with NO_NSPR_10_SUPPORT, r=wtc

---
 cmd/dbck/dbck.c      | 10 +++++-----
 cmd/dbck/dbrecover.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'cmd/dbck')

diff --git a/cmd/dbck/dbck.c b/cmd/dbck/dbck.c
index 3b2cd3663..31e1150bf 100644
--- a/cmd/dbck/dbck.c
+++ b/cmd/dbck/dbck.c
@@ -100,7 +100,7 @@ typedef struct certDBEntryListNodeStr  certDBEntryListNode;
  */
 typedef struct 
 {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     int index;
     certDBEntryListNode *pSubject;
 } certDBEntryMap;
@@ -113,7 +113,7 @@ typedef struct
  */
 typedef struct
 {
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     int index;
     int numCerts;
     certDBEntryListNode **pCerts;
@@ -256,7 +256,7 @@ dumpCertificate(CERTCertificate *cert, int num, PRFileDesc *outfile)
     PR_fprintf(outfile, "## SERIAL NUMBER:  ");
     printHexString(outfile, &cert->serialNumber);
     {  /*  XXX should be separate function.  */
-	int64 timeBefore, timeAfter;
+	PRTime timeBefore, timeAfter;
 	PRExplodedTime beforePrintable, afterPrintable;
 	char *beforestr, *afterstr;
 	DER_DecodeTimeChoice(&timeBefore, &cert->validity.notBefore);
@@ -360,7 +360,7 @@ mapCertEntries(certDBArray *dbArray)
     certDBEntryListNode *certNode, *subjNode;
     certDBSubjectEntryMap *smap;
     certDBEntryMap *map;
-    PRArenaPool *tmparena;
+    PLArenaPool *tmparena;
     SECItem derSubject;
     SECItem certKey;
     PRCList *cElem, *sElem;
@@ -924,7 +924,7 @@ fillDBEntryArray(NSSLOWCERTCertDBHandle *handle, certDBEntryType type,
     certDBEntryListNode *node;
     certDBEntryMap *mnode;
     certDBSubjectEntryMap *smnode;
-    PRArenaPool *arena;
+    PLArenaPool *arena;
     int count = 0;
 
     /* Initialize a dummy entry in the list.  The list head will be the
diff --git a/cmd/dbck/dbrecover.c b/cmd/dbck/dbrecover.c
index 0d1f0cc62..372c73b3f 100644
--- a/cmd/dbck/dbrecover.c
+++ b/cmd/dbck/dbrecover.c
@@ -174,7 +174,7 @@ userSaysDeleteCert(CERTCertificate **certs, int nCerts,
                    int errtype, dbRestoreInfo *info, int *certNums)
 {
     char response[32];
-    int32 nb;
+    PRInt32 nb;
     int i;
     /*  User wants to remove cert without prompting.  */
     if (info->promptUser[errtype] == PR_FALSE)
-- 
cgit v1.2.1