summaryrefslogtreecommitdiff
path: root/rsc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-16 22:55:37 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-16 23:11:08 +0100
commitc14d8664862a919277b53b315feeb38d47a50007 (patch)
tree62e5dc402e14b14b0bff8ed573185e4569a69c50 /rsc
parent542916044dfded030424c27592711a440cc3422f (diff)
Remove WTC support
http://www.openoffice.org/issues/show_bug.cgi?id=52746 "WTC - watcom compiler (OS2, WNT?) - obsolete"
Diffstat (limited to 'rsc')
-rw-r--r--rsc/source/parser/rsckey.cxx4
-rw-r--r--rsc/source/parser/rsclex.hxx2
-rw-r--r--rsc/source/prj/gui.cxx2
-rw-r--r--rsc/source/prj/start.cxx4
4 files changed, 4 insertions, 8 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