diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:24:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-17 13:24:13 +0000 |
| commit | 020992ad3c9e3ee22e3864f3767e9a1f2e835a0c (patch) | |
| tree | 15f7a88dfd6551839d9268ac240f13f254677b20 /moz | |
| parent | 92c6209b0d40966074be4df8430be7d64752e3cd (diff) | |
INTEGRATION: CWS macosxgcc4 (1.4.10); FILE MERGED
2005/10/03 18:54:38 fheckl 1.4.10.5: Still resolving the conflictwith m131
2005/10/03 15:40:57 fheckl 1.4.10.4: Resolved a conflict by merging two patches that involved roughly the same area of a file
2005/10/03 15:32:54 fheckl 1.4.10.3: Resolved a conflict by merging two patches that involved roughly the same area of a file
2005/10/03 15:19:54 fheckl 1.4.10.2: Resolved a conflict by merging two patches that involved roughly the same area of a file
2005/09/17 23:14:54 fheckl 1.4.10.1: adding necessary casts for compilation to succeed using gcc4 on MacOSX
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 55b0494941a8..354b4ed0044c 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -7086,11 +7086,22 @@ # Force applications to be built non-statically # when building the mozcomps meta component -*** misc/mozilla/security/nss/lib/pki1/oiddata.h Thu Aug 25 21:30:00 2005 ---- misc/build/mozilla/security/nss/lib/pki1/oiddata.h Thu Aug 25 21:31:28 2005 +*** misc/mozilla/security/nss/lib/pki1/oiddata.h Sun Sep 11 15:57:15 2005 +--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h Sat Sep 10 00:16:58 2005 *************** -*** 39,44 **** ---- 39,45 ---- +*** 39,49 **** + 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[];*/ +--- 39,50 ---- static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$"; #endif /* DEBUG */ @@ -7098,3 +7109,28 @@ #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[];*/ +*** misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h Sun Sep 11 16:02:28 2005 +--- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h Sat Sep 10 02:27:51 2005 +*************** +*** 132,138 **** + } + + PRBool IsArray() const +! {return (PRBool) TagPart() == T_ARRAY;} + + // 'Dependent' means that params of this type are dependent upon other + // params. e.g. an T_INTERFACE_IS is dependent upon some other param at +--- 132,138 ---- + } + + PRBool IsArray() const +! {return (PRBool) TagPart() == (PRBool)T_ARRAY;} + + // 'Dependent' means that params of this type are dependent upon other + // params. e.g. an T_INTERFACE_IS is dependent upon some other param at + |