diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 13:00:49 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-03 13:00:49 +0000 |
| commit | 3244f1bf73c3cb82e736ed7b5bb0280acca7cbaa (patch) | |
| tree | 8a3bd3bd9ec6a66f9ef602f31dd6c81dce3accf2 /rsc | |
| parent | f3e2577f64faab3699baabcc3c74a30296a829ff (diff) | |
INTEGRATION: CWS vcl79 (1.8.6); FILE MERGED
2007/06/18 13:13:51 pl 1.8.6.1: #i78468# remove old MAC
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/prj/gui.cxx | 14 | ||||
| -rw-r--r-- | rsc/source/prj/start.cxx | 13 |
2 files changed, 11 insertions, 16 deletions
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index c5e8c92317f1..4b5f98099482 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -4,9 +4,9 @@ * * $RCSfile: gui.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2007-03-26 15:01:06 $ + * last change: $Author: rt $ $Date: 2007-07-03 14:00:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,9 +38,6 @@ #include <stdlib.h> #include <stdio.h> -#ifdef MAC -#include <cursorctl.h> -#endif #ifndef _RSCRSC_HXX #include <rscrsc.hxx> @@ -57,7 +54,7 @@ static RscCompiler * pRscCompiler = NULL; /* */ /* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ -#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined( MAC ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) +#if defined( UNX ) || ( defined( PM2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) void ExitProgram( void ){ #else #if defined( CSET ) @@ -70,7 +67,7 @@ static RscCompiler * pRscCompiler = NULL; delete pRscCompiler; } -#if defined( UNX ) || defined( MAC ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__) +#if defined( UNX ) || ( defined( PM2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__) int main ( int argc, char ** argv) { #else #if defined( MTW ) @@ -86,9 +83,6 @@ int cdecl main ( int argc, char ** argv) { atexit( ExitProgram ); #endif #endif -#ifdef MAC - InitCursorCtl( 0 ); -#endif #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "debugging %s\n", argv[0] ); #endif diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 4af82a34f402..bfd54d61bd59 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -4,9 +4,9 @@ * * $RCSfile: start.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2007-03-26 15:01:17 $ + * last change: $Author: rt $ $Date: 2007-07-03 14:00:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,11 +44,12 @@ #define _spawnvp spawnvp #define _P_WAIT P_WAIT #endif + #ifdef UNX #include <unistd.h> #include <sys/wait.h> -#else -#ifndef MAC +#else // UNX + #include <io.h> #include <process.h> #if defined ( OS2 ) && !defined ( GCC ) @@ -57,8 +58,8 @@ #ifndef CSET #include <dos.h> #endif -#endif -#endif + +#endif // UNX #ifndef _RSCTOOLS_HXX #include <rsctools.hxx> |