Skip to content

N
nx-libs
Commit 793d587b authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Remove __UNIXOS2__ references

parent 603fe255
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
nx-X11/lib/xtrans/Xtrans.c
View file @ 793d587b
...@@ -631,7 +631,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) ...@@ -631,7 +631,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
break; break;
case 1: /* Set to non-blocking mode */ 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); ret = fcntl (fd, F_GETFL, 0);
if (ret != -1) if (ret != -1)
ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK); ret = fcntl (fd, F_SETFL, ret | O_NONBLOCK);
...@@ -643,7 +643,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) ...@@ -643,7 +643,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
ret = ioctl (fd, FIOSNBIO, &arg); ret = ioctl (fd, FIOSNBIO, &arg);
} }
#else #else
#if (defined(uniosu) || defined(WIN32) || defined(__UNIXOS2__)) && defined(FIONBIO) #if (defined(uniosu) || defined(WIN32)) && defined(FIONBIO)
{ {
#ifdef WIN32 #ifdef WIN32
u_long arg; u_long arg;
...@@ -1081,7 +1081,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret, ...@@ -1081,7 +1081,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
* may be used by it. * 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 * emulate readv
...@@ -1113,7 +1113,7 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) ...@@ -1113,7 +1113,7 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt)
#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ #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 * emulate writev
......
nx-X11/lib/xtrans/Xtransint.h
View file @ 793d587b
...@@ -282,7 +282,7 @@ typedef struct _Xtransport_table { ...@@ -282,7 +282,7 @@ typedef struct _Xtransport_table {
* systems, so they may be emulated. * 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) #define READV(ciptr, iov, iovcnt) TRANS(ReadV)(ciptr, iov, iovcnt)
...@@ -299,7 +299,7 @@ static int TRANS(ReadV)( ...@@ -299,7 +299,7 @@ static int TRANS(ReadV)(
#endif /* (SYSV && __i386__) || WIN32 || __sxg__ || */ #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) #define WRITEV(ciptr, iov, iovcnt) TRANS(WriteV)(ciptr, iov, iovcnt)
......
nx-X11/lib/xtrans/Xtranssock.c
View file @ 793d587b
...@@ -2572,7 +2572,7 @@ TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size) ...@@ -2572,7 +2572,7 @@ TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size)
#else /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */ #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); int ret = recv ((SOCKET)ciptr->fd, buf, size, 0);
#ifdef WIN32 #ifdef WIN32
...@@ -2629,7 +2629,7 @@ TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size) ...@@ -2629,7 +2629,7 @@ TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size)
#else /* #if defined(NX_TRANS_SOCKET) && defined(TRANS_CLIENT) */ #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); int ret = send ((SOCKET)ciptr->fd, buf, size, 0);
#ifdef WIN32 #ifdef WIN32
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment