Commit 38ab9ad8 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

os: unifdef __SCO__

parent 5fb7f53c
...@@ -80,9 +80,9 @@ SOFTWARE. ...@@ -80,9 +80,9 @@ SOFTWARE.
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <ctype.h> #include <ctype.h>
#if defined(TCPCONN) || defined(__SCO__) #if defined(TCPCONN)
#include <netinet/in.h> #include <netinet/in.h>
#endif /* TCPCONN || __SCO__ */ #endif /* TCPCONN */
#ifdef HAS_GETPEERUCRED #ifdef HAS_GETPEERUCRED
# include <ucred.h> # include <ucred.h>
...@@ -91,10 +91,10 @@ SOFTWARE. ...@@ -91,10 +91,10 @@ SOFTWARE.
# endif # endif
#endif #endif
#if defined(SVR4) || (defined(SYSV) && defined(i386)) || defined(__GNU__) #if defined(SVR4) || (defined(SYSV) && defined(__i386__)) || defined(__GNU__)
# include <sys/utsname.h> # include <sys/utsname.h>
#endif #endif
#if defined(SYSV) && defined(i386) #if defined(SYSV) && defined(__i386__)
# include <sys/stream.h> # include <sys/stream.h>
#endif #endif
#ifdef __GNU__ #ifdef __GNU__
...@@ -154,10 +154,6 @@ SOFTWARE. ...@@ -154,10 +154,6 @@ SOFTWARE.
#endif #endif
#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 #define X_INCLUDE_NETDB_H
#include <nx-X11/Xos_r.h> #include <nx-X11/Xos_r.h>
......
...@@ -358,7 +358,7 @@ ReadRequestFromClient(ClientPtr client) ...@@ -358,7 +358,7 @@ ReadRequestFromClient(ClientPtr client)
{ {
if ((result < 0) && ETEST(errno)) if ((result < 0) && ETEST(errno))
{ {
#if defined(SVR4) && defined(i386) && !defined(sun) #if defined(SVR4) && defined(__i386__) && !defined(sun)
if (0) if (0)
#endif #endif
{ {
......
...@@ -65,9 +65,6 @@ SOFTWARE. ...@@ -65,9 +65,6 @@ SOFTWARE.
#endif #endif
#endif #endif
#if defined(__SCO__)
#include <sys/wait.h>
#endif
#if !defined(SYSV) && !defined(WIN32) #if !defined(SYSV) && !defined(WIN32)
#include <sys/resource.h> #include <sys/resource.h>
...@@ -104,7 +101,7 @@ OsInit(void) ...@@ -104,7 +101,7 @@ OsInit(void)
InitNotifyFds(); InitNotifyFds();
#if !defined(__SCO__) && !defined(__CYGWIN__) && !defined(__UNIXWARE__) #if !defined(__CYGWIN__) && !defined(__UNIXWARE__)
fclose(stdin); fclose(stdin);
fclose(stdout); fclose(stdout);
#endif #endif
......
...@@ -2232,52 +2232,3 @@ CheckUserAuthorization(void) ...@@ -2232,52 +2232,3 @@ CheckUserAuthorization(void)
#endif #endif
} }
#ifdef __SCO__
#include <fcntl.h>
static void
lockit (int fd, short what)
{
struct flock lck;
lck.l_whence = 0;
lck.l_start = 0;
lck.l_len = 1;
lck.l_type = what;
(void)fcntl (fd, F_SETLKW, &lck);
}
/* SCO OpenServer 5 lacks pread/pwrite. Emulate them. */
ssize_t
pread (int fd, void *buf, size_t nbytes, off_t offset)
{
off_t saved;
ssize_t ret;
lockit (fd, F_RDLCK);
saved = lseek (fd, 0, SEEK_CUR);
lseek (fd, offset, SEEK_SET);
ret = read (fd, buf, nbytes);
lseek (fd, saved, SEEK_SET);
lockit (fd, F_UNLCK);
return ret;
}
ssize_t
pwrite (int fd, const void *buf, size_t nbytes, off_t offset)
{
off_t saved;
ssize_t ret;
lockit (fd, F_WRLCK);
saved = lseek (fd, 0, SEEK_CUR);
lseek (fd, offset, SEEK_SET);
ret = write (fd, buf, nbytes);
lseek (fd, saved, SEEK_SET);
lockit (fd, F_UNLCK);
return ret;
}
#endif /* __SCO__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment