diff options
| author | wtchang%redhat.com <devnull@localhost> | 2006-02-02 00:20:07 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2006-02-02 00:20:07 +0000 |
| commit | 1c86efa80e1511b6550a9c266d3fa2b4bbae66d3 (patch) | |
| tree | a94107734fbea576e62c741fec83ad2a4f60eb0b | |
| parent | 4f627a368c7c4995300776796845b1214fb0da74 (diff) | |
| download | nss-hg-MOZILLA_1_7_13_RC1.tar.gz | |
Bugzilla Bug 284386: fixed build error using gcc4. gcc4 disallows arraysMOZILLA_1_7_13_RELEASEMOZILLA_1_7_13_RC4MOZILLA_1_7_13_RC3MOZILLA_1_7_13_RC2MOZILLA_1_7_13_RC1
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
| -rw-r--r-- | security/nss/lib/pki1/oiddata.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/pki1/oiddata.h | 6 | ||||
| -rwxr-xr-x | security/nss/lib/pki1/oidgen.perl | 6 | ||||
| -rw-r--r-- | security/nss/lib/pki1/pki1.h | 4 |
4 files changed, 4 insertions, 14 deletions
diff --git a/security/nss/lib/pki1/oiddata.c b/security/nss/lib/pki1/oiddata.c index 1945421d1..d2629f66a 100644 --- a/security/nss/lib/pki1/oiddata.c +++ b/security/nss/lib/pki1/oiddata.c @@ -178,7 +178,7 @@ const NSSOID nss_builtin_oids[] = { "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 diff --git a/security/nss/lib/pki1/oiddata.h b/security/nss/lib/pki1/oiddata.h index d51c37517..215277414 100644 --- a/security/nss/lib/pki1/oiddata.h +++ b/security/nss/lib/pki1/oiddata.h @@ -43,12 +43,6 @@ static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; #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 2d644481e..db78db9fb 100755 --- a/security/nss/lib/pki1/oidgen.perl +++ b/security/nss/lib/pki1/oidgen.perl @@ -233,12 +233,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 15d29685d..27613f528 100644 --- a/security/nss/lib/pki1/pki1.h +++ b/security/nss/lib/pki1/pki1.h @@ -55,7 +55,9 @@ static const char PKI1_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$"; 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; |