diff options
| -rw-r--r-- | rsc/source/parser/rsckey.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rsclex.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/prj/gui.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/prj/start.cxx | 4 | ||||
| -rw-r--r-- | svl/inc/svl/svarray.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/edit/textdoc.cxx | 2 | ||||
| -rw-r--r-- | tools/source/fsys/tdir.cxx | 2 |
7 files changed, 7 insertions, 11 deletions
diff --git a/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx index 9bdf1338cac9..a6847fae1812 100644 --- a/rsc/source/parser/rsckey.cxx +++ b/rsc/source/parser/rsckey.cxx @@ -48,7 +48,7 @@ extern "C" { #if defined( ZTC ) && defined( PM2 ) int __CLIB KeyCompare( const void * pFirst, const void * pSecond ); #else -#if defined( WNT ) && !defined( WTC ) && !defined (ICC) +#if defined( WNT ) && !defined (ICC) int _cdecl KeyCompare( const void * pFirst, const void * pSecond ); #else int KeyCompare( const void * pFirst, const void * pSecond ); @@ -56,7 +56,7 @@ extern "C" { #endif } -#if defined( WNT ) && !defined( WTC ) && !defined(ICC) +#if defined( WNT ) && !defined(ICC) int _cdecl KeyCompare( const void * pFirst, const void * pSecond ){ #else int KeyCompare( const void * pFirst, const void * pSecond ){ diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx index dba60ec07d54..2cc5a4193106 100644 --- a/rsc/source/parser/rsclex.hxx +++ b/rsc/source/parser/rsclex.hxx @@ -110,7 +110,7 @@ extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); extern "C" int yylex( void ); #else -#if defined ( WTC ) || defined ( GCC ) || (_MSC_VER >= 1400) +#if defined ( GCC ) || (_MSC_VER >= 1400) int yyparse(); // forward Deklaration fuer erzeugte Funktion #else yyparse(); // forward Deklaration fuer erzeugte Funktion diff --git a/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx index 817d20b39854..f011c622e03e 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(__MINGW32__) +#if defined( UNX ) || ( defined( OS2 ) && ( defined( TCPP ) || defined ( GCC )) ) || defined(__MINGW32__) void ExitProgram( void ){ #else #if defined( CSET ) diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx index 84d7fe32b6a9..ea478e4c260a 100644 --- a/rsc/source/prj/start.cxx +++ b/rsc/source/prj/start.cxx @@ -179,8 +179,6 @@ static BOOL CallPrePro( const ByteString& rPrePro, nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() ); #elif defined CSET 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() ); #else nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() ); #endif @@ -293,8 +291,6 @@ static BOOL CallRsc2( ByteString aRsc2Name, 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() ); -#elif defined WTC - nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char* const*)aNewCmdL.GetBlock() ); #else nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() ); #endif diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index c3dbdc805ca9..a1d887994393 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -1024,7 +1024,7 @@ public:\ #define C40_PTR_REPLACE( c, p) Replace( (c const *) p ) #define C40_GETPOS( c, r) GetPos( (c const *)r ) #else -#if defined WTC || defined ICC || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) +#if defined ICC || (defined GCC && __GNUC__ >= 3) || (defined(WNT) && _MSC_VER >= 1400) #define C40_INSERT( c, p, n ) Insert( (c const *&) p, n ) #define C40_PUSH( c, p) Push( (c const *&) p ) #define C40_PTR_INSERT( c, p ) Insert( (c const *&) p ) diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index d42af5c25683..704e07ba37d6 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( WTC )) +#if defined( PM2 ) && !defined( CSET ) int _stdcall #else #ifdef WNT diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 6e715875b0bb..55fff85a4401 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -251,7 +251,7 @@ void Dir::Construct( DirEntryKind nKindFlags ) ByteString aTempName( GetName(), osl_getThreadTextEncoding() ); if ( aTempName.Search( "*" ) != STRING_NOTFOUND || aTempName.Search( "?" ) != STRING_NOTFOUND ) -#if defined( WNT ) && !defined( WTC ) +#if defined( WNT ) { ByteString aTStr(CutName(), osl_getThreadTextEncoding()); char* pBuffer = new char[aTStr.Len()+1]; |