summaryrefslogtreecommitdiff
path: root/Xtranssock.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2015-11-28 13:04:21 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2015-12-03 22:59:20 -0800
commitcc29fbc1fe86ae4dfe2f4eaae7352ea86aa4acac (patch)
tree09bb632dbad549a714bdc2d4c21e556ab1b91635 /Xtranssock.c
parent3ba0b7a37b9053662ff42f0b4caa856856098475 (diff)
downloadxorg-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>
Diffstat (limited to 'Xtranssock.c')
-rw-r--r--Xtranssock.c12
1 files changed, 0 insertions, 12 deletions
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 */
}