diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-04-04 15:06:28 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-04-14 12:31:48 +0200 |
| commit | be9e7782309a176a68ff856dc18d737813fb14ae (patch) | |
| tree | 02720408160fb4d8749174de0bfd9f6f06052734 | |
| parent | aaae18cc5f61f979d2c7d7d0d855fbbd8c4cebdb (diff) | |
remove outdated RS6000 checks
| -rw-r--r-- | rsc/inc/rsclex.hxx | 6 | ||||
| -rw-r--r-- | rsc/source/parser/rsclex.cxx | 8 | ||||
| -rw-r--r-- | tools/source/stream/strmunx.cxx | 4 |
3 files changed, 4 insertions, 14 deletions
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index 31069240468b..3ec3a181ede8 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -93,11 +93,7 @@ class ObjectStack }; /****************** F o r w a r d s **************************************/ -#if defined( RS6000 ) -extern "C" int yyparse(); // forward Deklaration fuer erzeugte Funktion -extern "C" void yyerror( char * ); -extern "C" int yylex( void ); -#elif defined ( SOLARIS ) +#if 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/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index b4a23f0a0bf5..6c261c4282ac 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -315,11 +315,7 @@ int MakeToken( YYSTYPE * pTokenVal ) return c1; } -#if defined( RS6000 ) -extern "C" int yylex() -#else int yylex() -#endif { if( bTargetDefined ) bTargetDefined = false; @@ -330,9 +326,7 @@ int yylex() return aKeyVal[ 0 ].nKeyWord; } -#ifdef RS6000 -extern "C" void yyerror( char* pMessage ) -#elif defined SOLARIS +#if defined SOLARIS extern "C" void yyerror( const char* pMessage ) #else void yyerror( char* pMessage ) diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index c3144ed3bd57..7c2c6513edfa 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -184,7 +184,7 @@ static sal_uInt32 GetSvError( int nErrno ) { 0, SVSTREAM_OK }, { EACCES, SVSTREAM_ACCESS_DENIED }, { EBADF, SVSTREAM_INVALID_HANDLE }, -#if defined(RS6000) || defined(NETBSD) || \ +#if defined(NETBSD) || \ defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY) || \ defined(IOS) @@ -201,7 +201,7 @@ static sal_uInt32 GetSvError( int nErrno ) { EAGAIN, SVSTREAM_LOCKING_VIOLATION }, { EISDIR, SVSTREAM_PATH_NOT_FOUND }, { ELOOP, SVSTREAM_PATH_NOT_FOUND }, -#if !defined(RS6000) && !defined(NETBSD) && !defined (FREEBSD) && \ +#if !defined(NETBSD) && !defined (FREEBSD) && \ !defined(MACOSX) && !defined(OPENBSD) && !defined(__FreeBSD_kernel__) && \ !defined(DRAGONFLY) { EMULTIHOP, SVSTREAM_PATH_NOT_FOUND }, |