From 017f25312f4c15617fa160d64cab5f11cd58417e Mon Sep 17 00:00:00 2001
From: "mcgreer%netscape.com" <mcgreer%netscape.com>
Date: Thu, 19 Jul 2001 20:40:42 +0000
Subject: [PATCH] make some header/source definitions consistent to fix build

---
 security/nss/lib/pki1/atav.c | 4 ++--
 security/nss/lib/pki1/pki1.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/security/nss/lib/pki1/atav.c b/security/nss/lib/pki1/atav.c
index b9ddf93acadf..c9f773c0b9c4 100644
--- a/security/nss/lib/pki1/atav.c
+++ b/security/nss/lib/pki1/atav.c
@@ -32,7 +32,7 @@
  */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: atav.c,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:16:16 $ $Name:  $";
+static const char CVS_ID[] = "@(#) $RCSfile: atav.c,v $ $Revision: 1.2 $ $Date: 2001/07/19 20:40:42 $ $Name:  $";
 #endif /* DEBUG */
 
 /*
@@ -1204,7 +1204,7 @@ nssATAV_CreateFromUTF8
       return (NSSATAV *)NULL;
     }
 
-    oidder = nssOID_GetDEREncoding(rv->oid, a);
+    oidder = nssOID_GetDEREncoding(rv->oid, (NSSDER *)NULL, a);
     if( (NSSDER *)NULL == oidder ) {
       (void)NSSArena_Destroy(a);
       (void)nss_ZFreeIf(rv->value);
diff --git a/security/nss/lib/pki1/pki1.h b/security/nss/lib/pki1/pki1.h
index 3e57f44b91ed..00f95bdc3766 100644
--- a/security/nss/lib/pki1/pki1.h
+++ b/security/nss/lib/pki1/pki1.h
@@ -35,7 +35,7 @@
 #define PKI1_H
 
 #ifdef DEBUG
-static const char PKI1_CVS_ID[] = "@(#) $RCSfile: pki1.h,v $ $Revision: 1.1 $ $Date: 2000/03/31 19:16:24 $ $Name:  $";
+static const char PKI1_CVS_ID[] = "@(#) $RCSfile: pki1.h,v $ $Revision: 1.2 $ $Date: 2001/07/19 20:40:42 $ $Name:  $";
 #endif /* DEBUG */
 
 /*
@@ -235,7 +235,7 @@ extern const NSSError NSS_ERROR_INVALID_NSSOID;
  */
 
 #ifdef DEBUG
-NSS_EXTERN const char *
+NSS_EXTERN const NSSUTF8 *
 nssOID_getExplanation
 (
   NSSOID *oid