diff options
| author | Adam Jackson <ajax@redhat.com> | 2010-12-16 13:13:54 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2010-12-20 12:11:11 -0500 |
| commit | f28e48834e40c7901c2efc72f962c9724e74a531 (patch) | |
| tree | 1d57aa4d1e9c142a56b2a1d7b056a18ee3e2fb1e /os | |
| parent | 040d54fb88f3970e19d0fbf911d6447f592496bd (diff) | |
Remove SCO support
This has never been buildable in any modular server release.
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'os')
| -rw-r--r-- | os/access.c | 12 | ||||
| -rw-r--r-- | os/osinit.c | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/os/access.c b/os/access.c index a532db661..d43fdf8e4 100644 --- a/os/access.c +++ b/os/access.c @@ -102,9 +102,9 @@ SOFTWARE. #include <sys/ioctl.h> #include <ctype.h> -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(__SCO__) +#if defined(TCPCONN) || defined(STREAMSCONN) #include <netinet/in.h> -#endif /* TCPCONN || STREAMSCONN || __SCO__ */ +#endif /* TCPCONN || STREAMSCONN */ #ifdef HAS_GETPEERUCRED # include <ucred.h> @@ -176,10 +176,6 @@ SOFTWARE. #endif #endif -#ifdef __SCO__ -/* The system defined value is wrong. MAXPATHLEN is set in sco5.cf. */ -#undef PATH_MAX -#endif #define X_INCLUDE_NETDB_H #include <X11/Xos_r.h> @@ -297,7 +293,7 @@ AccessUsingXdmcp (void) } -#if defined(SVR4) && !defined(SCO325) && !defined(sun) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) +#if defined(SVR4) && !defined(sun) && defined(SIOCGIFCONF) && !defined(USE_SIOCGLIFCONF) /* Deal with different SIOCGIFCONF ioctl semantics on these OSs */ @@ -327,7 +323,7 @@ ifioctl (int fd, int cmd, char *arg) #endif return ret; } -#else /* Case sun, SCO325 and others */ +#else #define ifioctl ioctl #endif diff --git a/os/osinit.c b/os/osinit.c index c83c32cf5..018e4047d 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -74,9 +74,6 @@ SOFTWARE. #endif #endif -#if defined(__SCO__) -#include <sys/wait.h> -#endif #if !defined(SYSV) && !defined(WIN32) #include <sys/resource.h> @@ -209,7 +206,7 @@ OsInit(void) dlinfo(RTLD_SELF, RTLD_DI_SETSIGNAL, &failure_signal); #endif -#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__) +#if !defined(__CYGWIN__) fclose(stdin); fclose(stdout); #endif |