diff options
| author | mbr <mbr@FreeBSD.org> | 2002-08-08 17:29:21 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-08-08 17:29:21 +0000 |
| commit | e8950459362248d696e0f970e20d8434cc78757e (patch) | |
| tree | e5d2799c5c49f46295081fc14fe8d731190f10de /editors/openoffice.org-2/files | |
| parent | 914f3910c3c646e24c0c97c5e94d7476a52c11c2 (diff) | |
| download | FreeBSD-ports-e8950459362248d696e0f970e20d8434cc78757e.zip FreeBSD-ports-e8950459362248d696e0f970e20d8434cc78757e.tar.gz | |
Fix another namespace collision which made the debug build segfaulting
in setup.
Submitted by: kan
Diffstat (limited to 'editors/openoffice.org-2/files')
| -rw-r--r-- | editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache b/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache new file mode 100644 index 0000000..593e9ea --- /dev/null +++ b/editors/openoffice.org-2/files/patch-scptools+source+linker+searchcache @@ -0,0 +1,34 @@ +Index: files/patch-scptools::source::linker::searchcache +=================================================================== +RCS file: files/patch-scptools::source::linker::searchcache +diff -N files/patch-scptools::source::linker::searchcache +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ files/patch-scptools::source::linker::searchcache 4 Aug 2002 15:28:04 -0000 +@@ -0,0 +1,27 @@ ++--- ../scptools/source/linker/searchcache.hxx.orig Fri Aug 2 22:53:46 2002 +++++ ../scptools/source/linker/searchcache.hxx Fri Aug 2 22:54:50 2002 ++@@ -72,11 +72,11 @@ ++ // types ++ /////////////////////////////////////////////////////////////////////////////// ++ ++-DECLARE_LIST( FileList, ByteString* ) +++DECLARE_LIST( SCacheFileList, ByteString* ) ++ struct Include ++ { ++ ByteString aBaseDir; ++- FileList aFileLst; +++ SCacheFileList aFileLst; ++ }; ++ DECLARE_LIST( IncludeList, Include* ) ++ ++--- ../scptools/source/linker/searchcache.cxx.orig Fri Aug 2 22:53:35 2002 +++++ ../scptools/source/linker/searchcache.cxx Fri Aug 2 22:55:14 2002 ++@@ -218,7 +218,7 @@ ++ rPath += aDelim; ++ } ++ ++-void ScanFileList( const ByteString& rPath, FileList& rLst ) +++void ScanFileList( const ByteString& rPath, SCacheFileList& rLst ) ++ { ++ Dir aFiles( rPath, FSYS_KIND_FILE ); ++ for( USHORT i = 0; i < aFiles.Count(); ++i ) |
