diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:26:14 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:26:14 +0000 |
commit | 00be4b8151baedbba3432453403b987ca20b3a9c (patch) | |
tree | f4b0105dd9b6c529d9e34b9911afad89d08b02b9 /idlc/source/idlccompile.cxx | |
parent | 1fed72955ae618d6728502ec530423aa57bfaf07 (diff) |
INTEGRATION: CWS os2port02 (1.21.4); FILE MERGED
2007/10/04 19:44:40 ydario 1.21.4.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'idlc/source/idlccompile.cxx')
-rw-r--r-- | idlc/source/idlccompile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 21fc198960c7..4d1fa1f98213 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -4,9 +4,9 @@ * * $RCSfile: idlccompile.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: vg $ $Date: 2007-09-20 15:01:19 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:26:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,7 +157,7 @@ OString makeTempName(const OString& prefix) { if ( osl_getEnvironment(TEMP.pData, &uTmpPath.pData) != osl_Process_E_None ) { -#if defined(SAL_W32) || defined(SAL_OS2) +#if defined(SAL_W32) tmpPath = OString("c:\\temp"); #else tmpPath = OString("/tmp"); @@ -318,7 +318,7 @@ sal_Int32 compileFile(const OString * pathname) idlc()->getOptions()->getProgramName().getStr(), cmdFileName.getStr()); exit(99); } -#ifdef SAL_OS2 +#ifdef SAL_OS2_00 char* tok = strtok( (char*)cppArgs.getStr(), " \t\n\r"); while( tok) { if (tok[strlen(tok)-1] == '\"') |