Annotation of /trunk/mozilla-thunderbird/patches/mozilla-thunderbird-1.0.7-nss-gcc4.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1818 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1818 byte(s)
-import
1 | niro | 153 | diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h |
2 | --- mozilla-orig/security/nss/lib/pki1/oiddata.h 2005-03-13 19:12:25.000000000 -0500 | ||
3 | +++ mozilla/security/nss/lib/pki1/oiddata.h 2005-03-13 19:15:19.000000000 -0500 | ||
4 | @@ -43,12 +43,6 @@ | ||
5 | #include "nsspki1t.h" | ||
6 | #endif /* NSSPKI1T_H */ | ||
7 | |||
8 | -extern const NSSOID nss_builtin_oids[]; | ||
9 | -extern const PRUint32 nss_builtin_oid_count; | ||
10 | - | ||
11 | -/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ | ||
12 | -/*extern const PRUint32 nss_attribute_type_alias_count;*/ | ||
13 | - | ||
14 | extern const NSSOID *NSS_OID_RFC1274_UID; | ||
15 | extern const NSSOID *NSS_OID_RFC1274_EMAIL; | ||
16 | extern const NSSOID *NSS_OID_RFC2247_DC; | ||
17 | diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl | ||
18 | --- mozilla-orig/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:12:25.000000000 -0500 | ||
19 | +++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-03-13 19:15:19.000000000 -0500 | ||
20 | @@ -233,12 +233,6 @@ | ||
21 | #include "nsspki1t.h" | ||
22 | #endif /* NSSPKI1T_H */ | ||
23 | |||
24 | -extern const NSSOID nss_builtin_oids[]; | ||
25 | -extern const PRUint32 nss_builtin_oid_count; | ||
26 | - | ||
27 | -/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/ | ||
28 | -/*extern const PRUint32 nss_attribute_type_alias_count;*/ | ||
29 | - | ||
30 | EOD | ||
31 | ; | ||
32 | |||
33 | diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h | ||
34 | --- mozilla-orig/security/nss/lib/pki1/pki1.h 2005-03-13 19:12:25.000000000 -0500 | ||
35 | +++ mozilla/security/nss/lib/pki1/pki1.h 2005-03-13 19:15:19.000000000 -0500 | ||
36 | @@ -55,7 +55,9 @@ | ||
37 | |||
38 | PR_BEGIN_EXTERN_C | ||
39 | |||
40 | -/* fgmr 19990505 moved these here from oiddata.h */ | ||
41 | +extern const NSSOID nss_builtin_oids[]; | ||
42 | +extern const PRUint32 nss_builtin_oid_count; | ||
43 | + | ||
44 | extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[]; | ||
45 | extern const PRUint32 nss_attribute_type_alias_count; | ||
46 |