SwallowOS/xorg_lib_libxtrans
1
0
Fork 0
mirror of https://github.com/SwallowOS/xorg_lib_libxtrans synced 2025-12-28 04:21:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for SysV on x86 platforms other than Solaris & SCO

Browse Source 
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>
This commit is contained in:
Alan Coopersmith
2015-11-28 13:04:21 -08:00
parent 3ba0b7a37b
commit cc29fbc1fe
3 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Xtrans.c
View File

@@ -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__)

8
Xtransint.h
View File

@@ -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 (

12
Xtranssock.c
View File

@@ -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 */
@@ -2112,12 +2104,8 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
if (ret == SOCKET_ERROR) errno = WSAGetLastError();
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 */
}