diff options
Diffstat (limited to 'os')
-rw-r--r-- | os/access.c | 12 | ||||
-rw-r--r-- | os/osinit.c | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/os/access.c b/os/access.c index 727fa26f0..3adbd1d2a 100644 --- a/os/access.c +++ b/os/access.c @@ -1,4 +1,3 @@ -/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */ /* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.7 2004/11/15 15:06:50 ago Exp $ */ /*********************************************************** @@ -80,9 +79,9 @@ SOFTWARE. #include <sys/ioctl.h> #include <ctype.h> -#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(SCO) +#if defined(TCPCONN) || defined(STREAMSCONN) || defined(ISC) || defined(__SCO__) #include <netinet/in.h> -#endif /* TCPCONN || STREAMSCONN || ISC || SCO */ +#endif /* TCPCONN || STREAMSCONN || ISC || __SCO__ */ #ifdef DNETCONN #include <netdnet/dn.h> #include <netdnet/dnetdb.h> @@ -134,9 +133,7 @@ SOFTWARE. #endif /* hpux */ #ifdef SVR4 -#ifndef SCO #include <sys/sockio.h> -#endif #include <sys/stropts.h> #endif @@ -189,6 +186,11 @@ 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> diff --git a/os/osinit.c b/os/osinit.c index 76938ce43..e8f6510d3 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -65,7 +65,7 @@ SOFTWARE. #endif #endif -#if defined(Lynx) || defined(SCO) || defined(SCO325) +#if defined(Lynx) || defined(__SCO__) #include <sys/wait.h> #endif @@ -110,7 +110,7 @@ OsInit(void) #ifdef XFree86LOADER xf86WrapperInit(); #endif -#if !defined(SCO) && !defined(__CYGWIN__) +#if !defined(__CYGWIN__) && !defined(__SCO__) && !defined(__UNIXWARE__) fclose(stdin); fclose(stdout); #endif @@ -119,7 +119,7 @@ OsInit(void) * then writing to stderr failed, and we'll write somewhere else * instead. (Apparently this never happens in the Real World.) */ - if (write (2, fname, 0) == -1) + if (write (2, fname, 0) == -1) { FILE *err; |