aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/xtrans
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2016-10-12 22:24:09 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-02 19:46:36 +0100
commit175a3416ef118a351d2dc97300df73afe94cfb9c (patch)
tree6f14ff542c1d129704ee6c34b442dd6ccae11f9b /nx-X11/lib/xtrans
parent97d651fcf71057ab7b07d2e9d95bfc1131be64f2 (diff)
downloadnx-libs-175a3416ef118a351d2dc97300df73afe94cfb9c.tar.gz
nx-libs-175a3416ef118a351d2dc97300df73afe94cfb9c.tar.bz2
nx-libs-175a3416ef118a351d2dc97300df73afe94cfb9c.zip
undef __UNIXOS2__
Diffstat (limited to 'nx-X11/lib/xtrans')
-rw-r--r--nx-X11/lib/xtrans/Xtrans.c4
-rw-r--r--nx-X11/lib/xtrans/Xtransint.h11
-rw-r--r--nx-X11/lib/xtrans/Xtranssock.c31
-rw-r--r--nx-X11/lib/xtrans/transport.c3
4 files changed, 0 insertions, 49 deletions
diff --git a/nx-X11/lib/xtrans/Xtrans.c b/nx-X11/lib/xtrans/Xtrans.c
index 4ad7a215a..aa0495b1a 100644
--- a/nx-X11/lib/xtrans/Xtrans.c
+++ b/nx-X11/lib/xtrans/Xtrans.c
@@ -703,11 +703,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
arg = 1;
/* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail
* eventually with EWOULDBLOCK */
-#ifndef __UNIXOS2__
ret = ioctl (fd, FIONBIO, &arg);
-#else
-/* ret = ioctl(fd, FIONBIO, &arg, sizeof(int));*/
-#endif
}
#else
ret = fcntl (fd, F_GETFL, 0);
diff --git a/nx-X11/lib/xtrans/Xtransint.h b/nx-X11/lib/xtrans/Xtransint.h
index 196eb6fc6..1458036ff 100644
--- a/nx-X11/lib/xtrans/Xtransint.h
+++ b/nx-X11/lib/xtrans/Xtransint.h
@@ -71,11 +71,7 @@ from The Open Group.
*/
#ifndef XTRANSDEBUG
-# ifndef __UNIXOS2__
# define XTRANSDEBUG 1
-# else
-# define XTRANSDEBUG 1
-# endif
#endif
#ifdef WIN32
@@ -98,9 +94,6 @@ from The Open Group.
# endif
# include <netinet/in.h>
# include <arpa/inet.h>
-# ifdef __UNIXOS2__
-# include <sys/ioctl.h>
-# endif
/*
* Moved the setting of NEED_UTSNAME to this header file from Xtrans.c,
@@ -167,11 +160,7 @@ from The Open Group.
# endif /* TRANS_OPEN_MAX */
-# ifdef __UNIXOS2__
-# define ESET(val)
-# else
# define ESET(val) errno = val
-# endif
# define EGET() errno
#else /* WIN32 */
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c
index 06c7719bf..f287f6c40 100644
--- a/nx-X11/lib/xtrans/Xtranssock.c
+++ b/nx-X11/lib/xtrans/Xtranssock.c
@@ -169,35 +169,8 @@ from the copyright holders.
#undef SO_DONTLINGER
#endif
-#if defined(__UNIXOS2__)
-#if defined(NOT_EMX09A)
-static int IBMsockInit = 0;
-#define SocketInitOnce()\
- if (!IBMsockInit) {\
- sock_init();\
- IBMsockInit = 1;\
- }
-
-
-#undef EINTR
-#define EINTR SOCEINTR
-#undef EINVAL
-#define EINVAL SOCEINVAL
-#undef errno
-#define errno sock_errno()
-#undef close
-#define close soclose
-#undef ioctl
-#define ioctl sockioctl
-#else
-#define SocketInitOnce() /**/
-#endif
-/* this is still not there */
-#define SOCKET int
-#else
/* others don't need this */
#define SocketInitOnce() /**/
-#endif
#if defined(linux)
#define HAVE_ABSTRACT_SOCKETS
@@ -2929,11 +2902,7 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
#if (defined(i386) && defined(SYSV) && !defined(SCO325)) || (defined(_SEQUENT_) && _SOCKET_VERSION == 1)
return ioctl (ciptr->fd, I_NREAD, (char *) pend);
#else
-#if defined(__UNIXOS2__)
- return ioctl (ciptr->fd, FIONREAD, (char*) pend, sizeof(int));
-#else
return ioctl (ciptr->fd, FIONREAD, (char *) pend);
-#endif /* __UNIXOS2__ */
#endif /* i386 && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */
#endif /* WIN32 */
}
diff --git a/nx-X11/lib/xtrans/transport.c b/nx-X11/lib/xtrans/transport.c
index 592cdfcf3..227549917 100644
--- a/nx-X11/lib/xtrans/transport.c
+++ b/nx-X11/lib/xtrans/transport.c
@@ -49,9 +49,6 @@ from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifdef __UNIXOS2__
-#define I_NEED_OS2_H
-#endif
#ifdef XSERV_t
#include "os.h"