diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
| commit | b8db9514147779737d0db35c82a3b680b36e3f9f (patch) | |
| tree | ccac9396d5368064c8a9e3dc32f81b6fd39cdf20 /transex3/source/helpmerge.cxx | |
| parent | 28bbe98abeef2ca37413405d3d94321353084390 (diff) | |
CWS-TOOLING: integrate CWS os2port04
2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.
Diffstat (limited to 'transex3/source/helpmerge.cxx')
| -rw-r--r-- | transex3/source/helpmerge.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/transex3/source/helpmerge.cxx b/transex3/source/helpmerge.cxx index 27ee6b2d047a..8aafc692f14c 100644 --- a/transex3/source/helpmerge.cxx +++ b/transex3/source/helpmerge.cxx @@ -493,7 +493,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile if( !Export::CopyFile( sTempFile , sTempFileCopy ) ) { -#ifdef UNX +#if defined(UNX) || defined(OS2) sleep( 3 ); #else Sleep( 3 ); @@ -512,7 +512,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile remove( sTargetFile.GetBuffer() ); } int rc; -#ifdef UNX +#if defined(UNX) || defined(OS2) rc = rename( sTempFile.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFile.GetBuffer() , sTargetFile.GetBuffer(), MOVEFILE_REPLACE_EXISTING ); @@ -528,7 +528,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile // if( aFS.GetSize() < 1 ) //#endif { -#ifdef UNX +#if defined(UNX) || defined(OS2) sleep( 3 ); #else Sleep( 3 ); @@ -538,7 +538,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile { remove( sTargetFile.GetBuffer() ); } -#ifdef UNX +#if defined(UNX) || defined(OS2) rc = rename( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() , MOVEFILE_REPLACE_EXISTING ); |