Bugzilla Bug 284386: fixed build error using gcc4. gcc4 disallows arrays MOZILLA_1_7_BRANCH MOZILLA_1_7_13_RC1 MOZILLA_1_7_13_RC2 MOZILLA_1_7_13_RC3 MOZILLA_1_7_13_RC4 MOZILLA_1_7_13_RELEASE
authorwtchang%redhat.com
Thu, 02 Feb 2006 00:20:07 +0000
branchMOZILLA_1_7_BRANCH
changeset 6525 425b5a3f8ab127343c82ccfbaa60d70ce6bf1a56
parent 5536 e8ae270e93c9878d9a3604126c4c5d6672ca8492
child 13746 12260bbd072b77531d18a30a3ef1ed8a9a5035c4
push idunknown
push userunknown
push dateunknown
bugs284386
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. a=dveditz for approval1.7.13. Modified Files: Tag: MOZILLA_1_7_BRANCH oiddata.c oiddata.h oidgen.perl pki1.h
security/nss/lib/pki1/oiddata.c
security/nss/lib/pki1/oiddata.h
security/nss/lib/pki1/oidgen.perl
security/nss/lib/pki1/pki1.h
--- a/security/nss/lib/pki1/oiddata.c
+++ b/security/nss/lib/pki1/oiddata.c
@@ -173,17 +173,17 @@ const NSSOID nss_builtin_oids[] = {
 #endif /* DEBUG */
     { "\x09\x92\x26\x89\x93\xf2\x2c\x64\x0a", 9 }
   },
   {
 #ifdef DEBUG
     "ucl",
     "RFC 1327 ucl",
 #endif /* DEBUG */
-    { "\x09\x92\x26\x86\xe8\xc4\xb5\xbe\x7f", 9 }
+    { "\x09\x92\x26\x86\xe8\xc4\xb5\xbe\x2c", 9 }
   },
   {
 #ifdef DEBUG
     "iso",
     "ISO",
 #endif /* DEBUG */
     { "\x80\x01", 2 }
   },
--- a/security/nss/lib/pki1/oiddata.h
+++ b/security/nss/lib/pki1/oiddata.h
@@ -38,22 +38,16 @@
 #ifdef DEBUG
 static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
 #endif /* DEBUG */
 
 #ifndef NSSPKI1T_H
 #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;
 extern const NSSOID *NSS_OID_ANSIX9_DSA_SIGNATURE;
 extern const NSSOID *NSS_OID_ANSIX9_DSA_SIGNATURE_WITH_SHA1_DIGEST;
 extern const NSSOID *NSS_OID_X942_DIFFIE_HELMAN_KEY;
 extern const NSSOID *NSS_OID_PKCS1_RSA_ENCRYPTION;
 extern const NSSOID *NSS_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION;
--- a/security/nss/lib/pki1/oidgen.perl
+++ b/security/nss/lib/pki1/oidgen.perl
@@ -228,22 +228,16 @@ print HFILE <<EOD
 #ifdef DEBUG
 static const char OIDDATA_CVS_ID[] = "$g{CVS_ID} ; $cvs_id";
 #endif /* DEBUG */
 
 #ifndef NSSPKI1T_H
 #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
     ;
 
 for( $i = 0; $i <= $count; $i++ ) {
   %y = %{$x[$i]};
   if( defined($y{NAME}) ) {
     print HFILE "extern const NSSOID *$y{NAME};\n";
   }
--- a/security/nss/lib/pki1/pki1.h
+++ b/security/nss/lib/pki1/pki1.h
@@ -50,17 +50,19 @@ static const char PKI1_CVS_ID[] = "@(#) 
 #endif /* PKI1T_H */
 
 #ifndef NSSPKI1_H
 #include "nsspki1.h"
 #endif /* NSSPKI1_H */
 
 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;
 
 /*
  * NSSOID
  *
  * The non-public "methods" regarding this "object" are:
  *