diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-26 14:24:07 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-26 14:24:07 +0000 |
| commit | a5ff891b914dad7aaf1f06d47b28ccbb7f3f636c (patch) | |
| tree | 8c3c89539697f3880f1ae6a2ae3a8363497542ef /moz | |
| parent | 52a66ee3d1c5dd1a6da659e4728c13a34ee0dee7 (diff) | |
INTEGRATION: CWS mozfix01 (1.11.20); FILE MERGED
2007/02/20 09:01:21 sparcmoz 1.11.20.1: #i66906# fix previous declaration with C++ linkage
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/mozilla-source-1.7.5.patch | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 1c832510a6f5..66f9ab382d2d 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -6783,8 +6783,27 @@ private : } ; -*** misc/mozilla/modules/libpref/src/Makefile.in 2004-01-16 20:22:37.000000000 +0100 ---- misc/build/mozilla/modules/libpref/src/Makefile.in 2006-02-24 09:41:55.000000000 +0100 +*** misc/mozilla/mailnews/mime/src/mimeeobj.h Sat Sep 29 06:07:42 2001 +--- misc/build/mozilla/mailnews/mime/src/mimeeobj.h Thu Oct 5 15:14:15 2006 +*************** +*** 54,60 **** + MimeLeafClass leaf; + }; + +! extern MimeExternalObjectClass mimeExternalObjectClass; + + struct MimeExternalObject { + MimeLeaf leaf; +--- 54,60 ---- + MimeLeafClass leaf; + }; + +! extern "C" MimeExternalObjectClass mimeExternalObjectClass; + + struct MimeExternalObject { + MimeLeaf leaf; +*** misc/mozilla/modules/libpref/src/Makefile.in Sat Jan 17 06:22:37 2004 +--- misc/build/mozilla/modules/libpref/src/Makefile.in Mon Oct 2 20:20:28 2006 *************** *** 78,84 **** PREF_JS_EXPORTS += $(srcdir)/init/non-shared.txt |