diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
| commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
| tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/programs/Xserver/os/io.c | |
| parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
| parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
| download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip | |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/programs/Xserver/os/io.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/io.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c index d184a981c..3771d40fb 100644 --- a/nx-X11/programs/Xserver/os/io.c +++ b/nx-X11/programs/Xserver/os/io.c @@ -70,12 +70,8 @@ SOFTWARE. #include <nx-X11/Xtrans/Xtrans.h> #include <nx-X11/Xmd.h> #include <errno.h> -#if !defined(__UNIXOS2__) && !defined(WIN32) -#ifndef Lynx +#if !defined(WIN32) #include <sys/uio.h> -#else -#include <uio.h> -#endif #endif #include <nx-X11/X.h> #include <nx-X11/Xproto.h> @@ -92,7 +88,6 @@ CallbackListPtr FlushCallback; /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN */ -#ifndef __UNIXOS2__ #ifndef WIN32 #if defined(EAGAIN) && defined(EWOULDBLOCK) #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK) @@ -106,9 +101,6 @@ CallbackListPtr FlushCallback; #else /* WIN32 The socket errorcodes differ from the normal errors*/ #define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK) #endif -#else /* __UNIXOS2__ Writing to full pipes may return ENOSPC */ -#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC) -#endif Bool CriticalOutputPending; int timesThisConnection = 0; |