diff options
| -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 | ||||
| -rw-r--r-- | tools/bootstrp/command.cxx | 4 | ||||
| -rw-r--r-- | tools/inc/tools/inetdef.hxx | 2 | ||||
| -rw-r--r-- | tools/inc/tools/solar.h | 2 | ||||
| -rw-r--r-- | tools/source/fsys/unx.cxx | 17 | ||||
| -rw-r--r-- | vcl/unx/inc/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/inc/salunx.h | 2 |
9 files changed, 6 insertions, 35 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 \ diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx index f47598f5cfd8..73db0f359354 100644 --- a/tools/bootstrp/command.cxx +++ b/tools/bootstrp/command.cxx @@ -29,10 +29,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#ifdef SCO -#define _IOSTREAM_H -#endif - #ifdef PRECOMPILED #include "first.hxx" #endif diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx index 28050f52c998..91636d8dc718 100644 --- a/tools/inc/tools/inetdef.hxx +++ b/tools/inc/tools/inetdef.hxx @@ -41,8 +41,6 @@ #define TOOLS_INETDEF_OS "Solaris Sparc" #elif defined SOLARIS && defined INTEL #define TOOLS_INETDEF_OS "Solaris x86" -#elif defined SCO -#define TOOLS_INETDEF_OS "SCO" #elif defined NETBSD && defined X86 #define TOOLS_INETDEF_OS "NetBSD/i386" #elif defined NETBSD && defined X86_64 diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index fbe94910a575..09ad054a8257 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -293,8 +293,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define __DLLEXTENSION "si.so" #elif defined SOLARIS && defined INTEL && defined __GNUC__ #define __DLLEXTENSION "sogi.so" -#elif defined SCO - #define __DLLEXTENSION "ci.so" #elif defined NETBSD && defined X86 #define __DLLEXTENSION "bi.so" #elif defined NETBSD && defined X86_64 diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 109ea26dd4d0..887dff9e79e3 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -37,8 +37,6 @@ #if defined LINUX #include <mntent.h> #define mnttab mntent -#elif defined SCO -#include <mnttab.h> #elif defined AIX #include <sys/mntctl.h> #include <sys/vmount.h> @@ -71,10 +69,6 @@ struct mnttab #define MOUNTPOINT mnt_mountp #define MOUNTOPTS mnt_mntopts #define MOUNTFS mnt_fstype -#elif defined SCO -#define MNTTAB "/etc/mnttab" -#define MOUNTSPECIAL mt_dev -#define MOUNTPOINT mt_filsys #else #define MOUNTSPECIAL mnt_fsname #define MOUNTPOINT mnt_dir @@ -143,12 +137,6 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) return FALSE; struct mnttab mnt[1]; while (getmntent (fp, mnt) != -1) -#elif defined SCO - FILE *fp = fopen (MNTTAB, "r"); - if (! fp) - return FALSE; - struct mnttab mnt[1]; - while (fread (&mnt, sizeof mnt, 1, fp) > 0) #elif defined DECUNIX || defined AIX FILE *fp = NULL; if (! fp) @@ -189,11 +177,8 @@ static BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) mytab->mountspecial = mnt->MOUNTSPECIAL; mytab->mountpoint = mnt->MOUNTPOINT; mytab->mountdevice = dev; -#ifndef SCO mytab->mymnttab_filesystem = mnt->MOUNTFS; -#else - mytab->mymnttab_filesystem = "ext2"; //default ist case sensitiv unter unix -#endif + return TRUE; } # ifdef LINUX diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index f7d2879fb22d..463a65d06078 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -47,7 +47,7 @@ class SalPrinter; DECLARE_LIST( SalDisplays, SalDisplay* ) -#if defined SCO || defined LINUX || defined NETBSD || defined AIX || \ +#if defined LINUX || defined NETBSD || defined AIX || \ defined FREEBSD || defined OPENBSD || defined DRAGONFLY #include <pthread.h> #else diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index 34a80e971b55..c0620d812f63 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -30,7 +30,7 @@ #define _SALUNX_H // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#if defined SCO || defined LINUX || defined FREEBSD || \ +#if defined LINUX || defined FREEBSD || \ defined NETBSD || defined OPENBSD || defined DRAGONFLY #include <sys/time.h> #elif defined AIX |