Commit 175a3416 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

undef __UNIXOS2__

parent 97d651fc
...@@ -703,11 +703,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) ...@@ -703,11 +703,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
arg = 1; arg = 1;
/* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail /* IBM TCP/IP understands this option too well: it causes TRANS(Read) to fail
* eventually with EWOULDBLOCK */ * eventually with EWOULDBLOCK */
#ifndef __UNIXOS2__
ret = ioctl (fd, FIONBIO, &arg); ret = ioctl (fd, FIONBIO, &arg);
#else
/* ret = ioctl(fd, FIONBIO, &arg, sizeof(int));*/
#endif
} }
#else #else
ret = fcntl (fd, F_GETFL, 0); ret = fcntl (fd, F_GETFL, 0);
......
...@@ -71,11 +71,7 @@ from The Open Group. ...@@ -71,11 +71,7 @@ from The Open Group.
*/ */
#ifndef XTRANSDEBUG #ifndef XTRANSDEBUG
# ifndef __UNIXOS2__
# define XTRANSDEBUG 1 # define XTRANSDEBUG 1
# else
# define XTRANSDEBUG 1
# endif
#endif #endif
#ifdef WIN32 #ifdef WIN32
...@@ -98,9 +94,6 @@ from The Open Group. ...@@ -98,9 +94,6 @@ from The Open Group.
# endif # endif
# include <netinet/in.h> # include <netinet/in.h>
# include <arpa/inet.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, * Moved the setting of NEED_UTSNAME to this header file from Xtrans.c,
...@@ -167,11 +160,7 @@ from The Open Group. ...@@ -167,11 +160,7 @@ from The Open Group.
# endif /* TRANS_OPEN_MAX */ # endif /* TRANS_OPEN_MAX */
# ifdef __UNIXOS2__
# define ESET(val)
# else
# define ESET(val) errno = val # define ESET(val) errno = val
# endif
# define EGET() errno # define EGET() errno
#else /* WIN32 */ #else /* WIN32 */
......
...@@ -169,35 +169,8 @@ from the copyright holders. ...@@ -169,35 +169,8 @@ from the copyright holders.
#undef SO_DONTLINGER #undef SO_DONTLINGER
#endif #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 */ /* others don't need this */
#define SocketInitOnce() /**/ #define SocketInitOnce() /**/
#endif
#if defined(linux) #if defined(linux)
#define HAVE_ABSTRACT_SOCKETS #define HAVE_ABSTRACT_SOCKETS
...@@ -2929,11 +2902,7 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend) ...@@ -2929,11 +2902,7 @@ TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
#if (defined(i386) && defined(SYSV) && !defined(SCO325)) || (defined(_SEQUENT_) && _SOCKET_VERSION == 1) #if (defined(i386) && defined(SYSV) && !defined(SCO325)) || (defined(_SEQUENT_) && _SOCKET_VERSION == 1)
return ioctl (ciptr->fd, I_NREAD, (char *) pend); return ioctl (ciptr->fd, I_NREAD, (char *) pend);
#else #else
#if defined(__UNIXOS2__)
return ioctl (ciptr->fd, FIONREAD, (char*) pend, sizeof(int));
#else
return ioctl (ciptr->fd, FIONREAD, (char *) pend); return ioctl (ciptr->fd, FIONREAD, (char *) pend);
#endif /* __UNIXOS2__ */
#endif /* i386 && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */ #endif /* i386 && SYSV || _SEQUENT_ && _SOCKET_VERSION == 1 */
#endif /* WIN32 */ #endif /* WIN32 */
} }
......
...@@ -49,9 +49,6 @@ from The Open Group. ...@@ -49,9 +49,6 @@ from The Open Group.
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
#ifdef XSERV_t #ifdef XSERV_t
#include "os.h" #include "os.h"
......
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