diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-11-28 13:04:21 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-12-03 22:59:20 -0800 |
| commit | cc29fbc1fe86ae4dfe2f4eaae7352ea86aa4acac (patch) | |
| tree | 09bb632dbad549a714bdc2d4c21e556ab1b91635 | |
| parent | 3ba0b7a37b9053662ff42f0b4caa856856098475 (diff) | |
| download | xorg-lib-libxtrans-cc29fbc1fe86ae4dfe2f4eaae7352ea86aa4acac.tar.gz | |
Remove support for SysV on x86 platforms other than Solaris & SCO
No other x86 SysV platforms have ever been supported in the modular
build systems, so we don't need to keep carrying around a bunch of
ifdef's for them.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
| -rw-r--r-- | Xtrans.c | 7 | ||||
| -rw-r--r-- | Xtransint.h | 8 | ||||
| -rw-r--r-- | Xtranssock.c | 12 |
3 files changed, 6 insertions, 21 deletions
@@ -1415,7 +1415,7 @@ TRANS(MakeAllCLTSServerListeners) (const char *port, int *partial, */ -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(__sun) || defined(WIN32) +#ifdef WIN32 /* * emulate readv @@ -1445,9 +1445,6 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) return total; } -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ - -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(__sun) || defined(WIN32) /* * emulate writev @@ -1477,7 +1474,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) return total; } -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ +#endif /* WIN32 */ #if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) diff --git a/Xtransint.h b/Xtransint.h index c46596f..dd63e27 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -350,7 +350,7 @@ typedef struct _Xtransport_table { * systems, so they may be emulated. */ -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(__sun) || defined(WIN32) +#ifdef WIN32 #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt) @@ -364,10 +364,10 @@ static int TRANS(ReadV)( #define READV(ciptr, iov, iovcnt) readv(ciptr->fd, iov, iovcnt) -#endif /* CRAY || (SYSV && __i386__) || WIN32 || __sxg__ || */ +#endif /* WIN32 */ -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(__sun) || defined(WIN32) +#ifdef WIN32 #define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt) @@ -381,7 +381,7 @@ static int TRANS(WriteV)( #define WRITEV(ciptr, iov, iovcnt) writev(ciptr->fd, iov, iovcnt) -#endif /* CRAY || WIN32 || __sxg__ */ +#endif /* WIN32 */ static int is_numeric ( diff --git a/Xtranssock.c b/Xtranssock.c index b915380..35eaf16 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -112,14 +112,6 @@ from the copyright holders. #include <sys/filio.h> #endif -#if (defined(__i386__) && defined(SYSV)) && !defined(SCO325) && !defined(__sun) -#include <net/errno.h> -#endif - -#if defined(__i386__) && defined(SYSV) -#include <sys/stropts.h> -#endif - #include <unistd.h> #else /* !WIN32 */ @@ -2113,11 +2105,7 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend) return ret; } #else -#if defined(__i386__) && defined(SYSV) && !defined(SCO325) - return ioctl (ciptr->fd, I_NREAD, (char *) pend); -#else return ioctl (ciptr->fd, FIONREAD, (char *) pend); -#endif /* __i386__ && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */ #endif /* WIN32 */ } |