[PATCH:libxtrans] Remove support for SysV on x86 platforms other than Solaris & SCO

[Alan Coopersmith]

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 at oracle.com>
---
 Xtrans.c     |    7 ++-----
 Xtransint.h  |    8 ++++----
 Xtranssock.c |   12 ------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Xtrans.c b/Xtrans.c
index 19b1828..5d86328 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -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 */
 }
 
-- 
1.7.9.2