diff options
-rw-r--r-- | rsc/source/prj/gui.cxx | 8 | ||||
-rw-r--r-- | rsc/source/prj/start.cxx | 6 | ||||
-rw-r--r-- | svtools/source/edit/textdoc.cxx | 2 |
3 files changed, 2 insertions, 14 deletions
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index ecbf57928f92..42d45caeb433 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -46,12 +46,8 @@ static RscCompiler * pRscCompiler = NULL; #if defined( UNX ) || defined ( GCC ) || defined(__MINGW32__) void ExitProgram( void ){ #else -#if defined( CSET ) - void _Optlink ExitProgram( void ){ -#else void cdecl ExitProgram( void ){ #endif -#endif if( pRscCompiler ) delete pRscCompiler; } @@ -72,11 +68,7 @@ RscVerbosity lcl_determineVerbosity( int argc, char ** argv ) SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { #ifndef UNX -#ifdef CSET atexit( ExitProgram ); -#else - atexit( ExitProgram ); -#endif #endif #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "debugging %s\n", argv[0] ); diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 0ac6a39a0f7e..18609a5b53df 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -44,7 +44,7 @@ #if defined ( OS2 ) && !defined ( GCC ) #include <direct.h> #endif -#if !defined ( CSET ) && !defined ( OS2 ) +#if !defined ( OS2 ) #include <dos.h> #endif @@ -173,8 +173,6 @@ static BOOL CallPrePro( const ByteString& rPrePro, #if defined UNX || defined OS2 nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); -#elif defined CSET - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #endif @@ -285,8 +283,6 @@ static BOOL CallRsc2( ByteString aRsc2Name, #if 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() ); #else nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() ); #endif diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index 704e07ba37d6..b437943a96bb 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -40,7 +40,7 @@ SV_IMPL_PTRARR( TextCharAttribs, TextCharAttribPtr ); // Vergleichmethode wird von QuickSort gerufen... EXTERN_C -#if defined( PM2 ) && !defined( CSET ) +#if defined( PM2 ) int _stdcall #else #ifdef WNT |