diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 12:46:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 12:46:39 +0000 |
| commit | 51e55f02a9f2786c52034c430f16c528c35a12e2 (patch) | |
| tree | b4c8a6fdc9ff67533783bb823407526cb45e21b4 /moz | |
| parent | eb4ca355f76950c34604d983b268fb19786b8ab3 (diff) | |
INTEGRATION: CWS dba202a (1.6.6); FILE MERGED
2005/12/21 12:48:52 fs 1.6.6.2: RESYNC: (1.6-1.7); FILE MERGED
2005/11/24 10:00:09 fs 1.6.6.1: #i52789# small patch for building with gcc 4.0.1
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 31a6fc38819d..c2a391e6dcb2 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -7129,11 +7129,27 @@ } PRBool IsArray() const -! {return (PRBool) TagPart() == (PRBool)T_ARRAY;} +! {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 - +*************** +*** 152,158 **** + uint8 TagPart() const + {return (uint8) (flags & XPT_TDP_TAGMASK);} + +! enum + { + T_I8 = TD_INT8 , + T_I16 = TD_INT16 , +--- 152,158 ---- + uint8 TagPart() const + {return (uint8) (flags & XPT_TDP_TAGMASK);} + +! enum _xpttype + { + T_I8 = TD_INT8 , + T_I16 = TD_INT16 , *** misc/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp Thu Sep 2 01:45:24 2004 --- misc/build/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp Sat Nov 5 22:45:54 2005 *************** |