From 6c97929ef66f8e55de301e4e3f7509e22e21992b Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 2 Nov 2007 12:08:20 +0000 Subject: INTEGRATION: CWS os2port02 (1.11.2); FILE MERGED 2007/09/30 11:48:12 ydario 1.11.2.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration. --- rsc/source/prj/start.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'rsc/source/prj/start.cxx') diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 5b0e2cfaa75d..e5f462d4bcd2 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -4,9 +4,9 @@ * * $RCSfile: start.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: vg $ $Date: 2007-09-20 16:34:19 $ + * last change: $Author: hr $ $Date: 2007-11-02 13:08:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -167,7 +167,7 @@ static BOOL CallPrePro( const ByteString& rPrePro, printf( "\n" ); } -#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 +#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); #elif defined CSET nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), char **) (const char**)pCmdL->GetBlock() ); @@ -269,7 +269,7 @@ static BOOL CallRsc2( ByteString aRsc2Name, fclose( fRspFile ); }; -#if ((defined PM2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 +#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2 nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() ); #elif defined CSET nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() ); @@ -301,7 +301,7 @@ static BOOL CallRsc2( ByteString aRsc2Name, |* Letzte Aenderung MM 05.09.91 |* *************************************************************************/ -#if defined UNX || (defined PM2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__) +#if defined UNX || (defined OS2 && (defined CSET || defined GCC )) || defined WTC || defined MTW || defined ICC || defined(__MINGW32__) int main ( int argc, char ** argv) { #else -- cgit v1.2.3