Magellan Linux

Annotation of /trunk/nvu/patches/nvu-1.0_pre-gcc4.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (hide annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 1924 byte(s)
-import

1 niro 153 diff -urN -p mozilla~/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
2     --- mozilla~/security/nss/lib/pki1/oiddata.h 2002-01-03 23:22:07.000000000 -0600
3     +++ mozilla/security/nss/lib/pki1/oiddata.h 2005-06-01 02:20:28.000000000 -0600
4     @@ -43,12 +43,6 @@ static const char OIDDATA_CVS_ID[] = "@(
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 -urN -p mozilla~/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
18     --- mozilla~/security/nss/lib/pki1/oidgen.perl 2001-11-07 18:15:25.000000000 -0600
19     +++ mozilla/security/nss/lib/pki1/oidgen.perl 2005-06-01 02:21:31.000000000 -0600
20     @@ -233,12 +233,6 @@ static const char OIDDATA_CVS_ID[] = "$g
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 -urN -p mozilla~/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
34     --- mozilla~/security/nss/lib/pki1/pki1.h 2001-07-19 14:40:42.000000000 -0600
35     +++ mozilla/security/nss/lib/pki1/pki1.h 2005-06-01 02:22:50.000000000 -0600
36     @@ -56,6 +56,8 @@ static const char PKI1_CVS_ID[] = "@(#)
37     PR_BEGIN_EXTERN_C
38    
39     /* fgmr 19990505 moved these here from oiddata.h */
40     +extern const NSSOID nss_builtin_oids[];
41     +extern const PRUint32 nss_builtin_oid_count;
42     extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
43     extern const PRUint32 nss_attribute_type_alias_count;
44