aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-13 21:53:17 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 19:46:36 +0100
commit793d587b46a7ec47ea62d99920de4dc607514604 (patch)
tree36a325bb5375a753f5496dd38df55d8054dfc9d3 /nx-X11
parent603fe25544e464561b0c9435f8816b5ab80814e1 (diff)
downloadnx-libs-793d587b46a7ec47ea62d99920de4dc607514604.tar.gz
nx-libs-793d587b46a7ec47ea62d99920de4dc607514604.tar.bz2
nx-libs-793d587b46a7ec47ea62d99920de4dc607514604.zip
Remove __UNIXOS2__ references
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/lib/xtrans/Xtrans.c8
-rw-r--r--nx-X11/lib/xtrans/Xtransint.h4
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c
index 130ef5ba0..f21ec3618 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/xtrans/Xtrans.c
@@ -631,7 +631,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
break;
case 1: /* Set to non-blocking mode */
-#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(uniosu) && !defined(__UNIXOS2__) && !defined(SCO325))
+#if defined(O_NONBLOCK) && (!defined(ultrix) && !defined(uniosu) && !defined(SCO325))
ret = fcntl (fd, F_GETFL, 0);
if (ret != -1)
ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK);
@@ -643,7 +643,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
ret = ioctl (fd, FIOSNBIO, &arg);
}
#else
-#if (defined(uniosu) || defined(WIN32) || defined(__UNIXOS2__)) && defined(FIONBIO)
+#if (defined(uniosu) || defined(WIN32)) && defined(FIONBIO)
{
#ifdef WIN32
u_long arg;
@@ -1081,7 +1081,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
* may be used by it.
*/
-#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__)
+#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__)
/*
* emulate readv
@@ -1113,7 +1113,7 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
#endif /* SYSV && __i386__ || WIN32 || __sxg__ */
-#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__)
+#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__)
/*
* emulate writev
diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/xtrans/Xtransint.h
index c25f7c024..2a138484b 100644
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/xtrans/Xtransint.h
@@ -282,7 +282,7 @@ typedef struct _Xtransport_table {
* systems, so they may be emulated.
*/
-#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__)
+#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__)
#define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt)
@@ -299,7 +299,7 @@ static int TRANS(ReadV)(
#endif /* (SYSV && __i386__) || WIN32 || __sxg__ || */
-#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__) || defined(__UNIXOS2__)
+#if (defined(SYSV) && defined(__i386__) && !defined(__SCO__)) || defined(WIN32) || defined(__sxg__)
#define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt)
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index 6c91d924b..ccfa0e13b 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -2572,7 +2572,7 @@ TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size)
#else /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */
-#if defined(WIN32) || defined(__UNIXOS2__)
+#if defined(WIN32)
{
int ret = recv ((SOCKET)ciptr->fd, buf, size, 0);
#ifdef WIN32
@@ -2629,7 +2629,7 @@ TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size)
#else /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */
-#if defined(WIN32) || defined(__UNIXOS2__)
+#if defined(WIN32)
{
int ret = send ((SOCKET)ciptr->fd, buf, size, 0);
#ifdef WIN32