diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 13:11:31 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 20:17:26 +0100 |
| commit | 644ee4816ce7fbb59745c4cd2264c9f31d8483fe (patch) | |
| tree | ab0e1580f50538eecf5853491ff4aff36457467d /rsc | |
| parent | b2bf8c258281feabbe3933b61a4d3397d220852f (diff) | |
Remove SCO support
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rsclex.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rsclex.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/prj/makefile.mk | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index 8cd95c7296c8..a6943ea1b0cd 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -295,7 +295,7 @@ int MakeToken( YYSTYPE * pTokenVal ){ return( c1 ); } -#if defined( RS6000 ) || defined( SCO ) +#if defined( RS6000 ) extern "C" int yylex() #else int yylex() @@ -314,7 +314,7 @@ int yylex() /****************** yyerror **********************************************/ #ifdef RS6000 extern "C" void yyerror( char* pMessage ) -#elif defined SCO || defined SOLARIS +#elif defined SOLARIS extern "C" void yyerror( const char* pMessage ) #else void yyerror( char* pMessage ) diff --git a/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx index af4783efb32d..dba60ec07d54 100644 --- a/rsc/source/parser/rsclex.hxx +++ b/rsc/source/parser/rsclex.hxx @@ -105,7 +105,7 @@ class ObjectStack { extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( char * ); extern "C" int yylex( void ); -#elif defined( SCO ) || defined ( SOLARIS ) +#elif defined ( SOLARIS ) extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion extern "C" void yyerror( const char * ); extern "C" int yylex( void ); diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk index 128d23160cc8..b8e0224a5cd0 100644 --- a/rsc/source/prj/makefile.mk +++ b/rsc/source/prj/makefile.mk @@ -51,13 +51,7 @@ APP1STACK=64000 APP1RPATH=NONE APP2TARGET= rsc2 -.IF "$(OS)"=="SCO" -# SCO hat Probleme mit fork/exec und einigen shared libraries. -# rsc2 muss daher statisch gelinkt werden -APP2STDLIBS=$(STATIC) -latools $(BPICONVLIB) $(OSLLIB) $(RTLLIB) $(DYNAMIC) -.ELSE APP2STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB) -.ENDIF APP2LIBS= $(LB)$/rsctoo.lib \ $(LB)$/rscres.lib \ $(LB)$/rscpar.lib \ |