From 137aa20e567744adc91074cfa0a0f2ee2bb899d7 Mon Sep 17 00:00:00 2001
From: "wtchang%redhat.com" <devnull@localhost>
Date: Mon, 14 Mar 2005 18:02:00 +0000
Subject: Bugzilla Bug 284386: fixed build error using gcc4.  gcc4 disallows
 arrays of incomplete element type (which are invalid in C).  We moved the
 declaration of nss_builtin_oids to pki1.h, after the definition of NSSOID.
 r=caillon. Modified Files: oiddata.h oidgen.perl pki1.h

---
 security/nss/lib/pki1/oiddata.h   | 6 ------
 security/nss/lib/pki1/oidgen.perl | 6 ------
 security/nss/lib/pki1/pki1.h      | 4 +++-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/security/nss/lib/pki1/oiddata.h b/security/nss/lib/pki1/oiddata.h
index 372ae3fd7..bb48bdfa3 100644
--- a/security/nss/lib/pki1/oiddata.h
+++ b/security/nss/lib/pki1/oiddata.h
@@ -46,12 +46,6 @@ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ ; @(#) $R
 #include "nsspki1t.h"
 #endif /* NSSPKI1T_H */
 
-extern const NSSOID nss_builtin_oids[];
-extern const PRUint32 nss_builtin_oid_count;
-
-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
-/*extern const PRUint32 nss_attribute_type_alias_count;*/
-
 extern const NSSOID *NSS_OID_RFC1274_UID;
 extern const NSSOID *NSS_OID_RFC1274_EMAIL;
 extern const NSSOID *NSS_OID_RFC2247_DC;
diff --git a/security/nss/lib/pki1/oidgen.perl b/security/nss/lib/pki1/oidgen.perl
index b63dc171f..3b6abc2ed 100755
--- a/security/nss/lib/pki1/oidgen.perl
+++ b/security/nss/lib/pki1/oidgen.perl
@@ -244,12 +244,6 @@ static const char OIDDATA_CVS_ID[] = "$g{CVS_ID} ; $cvs_id";
 #include "nsspki1t.h"
 #endif /* NSSPKI1T_H */
 
-extern const NSSOID nss_builtin_oids[];
-extern const PRUint32 nss_builtin_oid_count;
-
-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
-/*extern const PRUint32 nss_attribute_type_alias_count;*/
-
 EOD
     ;
 
diff --git a/security/nss/lib/pki1/pki1.h b/security/nss/lib/pki1/pki1.h
index 65e88697c..c0f8b75c0 100644
--- a/security/nss/lib/pki1/pki1.h
+++ b/security/nss/lib/pki1/pki1.h
@@ -58,7 +58,9 @@ static const char PKI1_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$";
 
 PR_BEGIN_EXTERN_C
 
-/* fgmr 19990505 moved these here from oiddata.h */
+extern const NSSOID nss_builtin_oids[];
+extern const PRUint32 nss_builtin_oid_count;
+
 extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
 extern const PRUint32 nss_attribute_type_alias_count;
 
-- 
cgit v1.2.1