diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 22:42:23 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 23:11:07 +0100 |
commit | 542916044dfded030424c27592711a440cc3422f (patch) | |
tree | 573f42a1fb875d0665a98575e20bd3a7c5af656c | |
parent | cbbaf4fb45979785385932e4c5fa3523228eab69 (diff) |
Remove MTW support
http://www.openoffice.org/issues/show_bug.cgi?id=52746
"MTW - metrowerks compiler (mac OS9 ?) - obsolete"
-rw-r--r-- | rsc/source/prj/gui.cxx | 6 | ||||
-rw-r--r-- | rsc/source/prj/start.cxx | 4 | ||||
-rw-r--r-- | svl/source/svdde/ddeimp.hxx | 2 | ||||
-rw-r--r-- | svl/source/svdde/ddeinf.cxx | 2 | ||||
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 2 | ||||
-rw-r--r-- | svtools/source/edit/textdoc.cxx | 2 |
6 files changed, 5 insertions, 13 deletions
diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index ff2ebce8c1ab..817d20b39854 100644 --- a/rsc/source/prj/gui.cxx +++ b/rsc/source/prj/gui.cxx @@ -43,7 +43,7 @@ static RscCompiler * pRscCompiler = NULL; /* */ /* Description : Gibt die Temporaeren Dateien frei. */ /****************************************************************/ -#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined (MTW) || defined(__MINGW32__) +#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined (WTC) || defined(__MINGW32__) void ExitProgram( void ){ #else #if defined( CSET ) @@ -86,11 +86,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) { InitRscCompiler(); RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) ); -#ifdef MTW - RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl ); -#else RscCmdLine* pCmdLine = new RscCmdLine( argc, argv, pErrHdl ); -#endif RscTypCont* pTypCont = new RscTypCont( pErrHdl, pCmdLine->nByteOrder, pCmdLine->aPath, diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index f95024fcd465..84d7fe32b6a9 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -181,8 +181,6 @@ static BOOL CallPrePro( const ByteString& rPrePro, nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #elif defined WTC nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char* const*)pCmdL->GetBlock() ); -#elif defined MTW - nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (char**)pCmdL->GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #endif @@ -297,8 +295,6 @@ static BOOL CallRsc2( ByteString aRsc2Name, nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char **)(const char**)aNewCmdL.GetBlock() ); #elif defined WTC nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char* const*)aNewCmdL.GetBlock() ); -#elif defined MTW - nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (char**)aNewCmdL.GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() ); #endif diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 81e18ae90030..24c2c3a6a1c4 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -95,7 +95,7 @@ public: static HDDEDATA CALLBACK InfCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); #else -#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if (defined ( GCC ) && defined ( OS2 )) || defined( ICC ) static HDDEDATA CALLBACK CliCallback ( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ); static HDDEDATA CALLBACK SvrCallback diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index a6248d44a95c..377dde44fdba 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -41,7 +41,7 @@ HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) #else -#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) HDDEDATA CALLBACK DdeInternal::InfCallback( WORD, WORD, HCONV, HSZ, HSZ, HDDEDATA, DWORD, DWORD ) #else diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 1f8c84d18bfc..84fdb047d752 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -65,7 +65,7 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) #else -#if defined ( MTW ) || ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) +#if ( defined ( GCC ) && defined ( OS2 )) || defined( ICC ) HDDEDATA CALLBACK DdeInternal::SvrCallback( WORD nCode, WORD nCbType, HCONV hConv, HSZ hText1, HSZ hText2, HDDEDATA hData, DWORD, DWORD ) diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index cffd4ad0f68f..d42af5c25683 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 ) && !defined ( MTW ) && !defined( WTC )) +#if defined( PM2 ) && (!defined( CSET ) && !defined( WTC )) int _stdcall #else #ifdef WNT |