--- a/Socket.st	Mon May 16 08:37:03 2016 +0200
+++ b/Socket.st	Tue May 17 02:08:05 2016 +0200
@@ -30,7 +30,7 @@
 #endif
 #include "stxOSDefs.h"
 
-#ifdef WIN32
+#ifdef __win32__
 //#define DEBUG 1
 /* this is to catch uses of those - there should be none */
 # undef __BEGIN_INTERRUPTABLE__
@@ -63,11 +63,11 @@
 # else
 #  define SOCKET_FROM_FD(fd)               (SOCKET)(fd)
 # endif
-#else /* not WIN32 */
+#else /* not __win32__ */
 # define SOCKET_FROM_FD(fd)   (fd)
 # define closesocket(sock)    close(sock)
 # define SOCKET               int
-#endif /* ! WIN32 */
+#endif /* ! __win32__ */
 
 #define SOCKET_FROM_FILE(f)             (SOCKET_FROM_FD(fileno(f)))
 #define SOCKET_FROM_FILE_OBJECT(f)      (__INST(handleType) == @symbol(socketHandle) ? SOCKET_FROM_FD(__FILEVal(f)) : SOCKET_FROM_FILE(__FILEVal(f)))
@@ -116,11 +116,11 @@
 #ifndef FALSE
 # define FALSE  0
 #endif
-#ifndef WIN32
+#ifndef __win32__
 typedef int BOOL;
 #endif
 
-#ifdef WIN32
+#ifdef __win32__
 # undef stdout
 # undef stderr
 # define stdout __win32_stdout()
@@ -1883,7 +1883,7 @@
     ret = bind(sock, (struct sockaddr *)&sa, sockaddr_size);
 # endif
     if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	if (errno == 0) {
 	    errno = WSAGetLastError();
 	}
@@ -1991,7 +1991,7 @@
 #endif
 
     if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	if (errno == 0) {
 	    errno = WSAGetLastError();
 	}
@@ -2162,7 +2162,7 @@
 
     sock = SOCKET_FROM_FILE_OBJECT(fp);
 
-#ifdef WIN32
+#ifdef __win32__
      ioctlsocket(sock, FIONBIO, &on);
 #elif defined(O_NONBLOCK)
     /*
@@ -2202,13 +2202,13 @@
     // __setWrapCallDebugging(1,0);
 # else // !DO_WRAP_CALLS
 
-#  if !defined(WIN32) && !defined(O_NONBLOCK)
+#  if !defined(__win32__) && !defined(O_NONBLOCK)
     __BEGIN_INTERRUPTABLE__
 #  endif
     do {
 	ret = connect(sock, (struct sockaddr *)&sa, sockaddr_size);
     } while ((ret < 0)
-#  ifdef WIN32
+#  ifdef __win32__
 	     && (errno = WSAGetLastError())
 #  endif
 	     && ((errno == EINTR)
@@ -2216,12 +2216,12 @@
 		 || (errno == EAGAIN)
 #  endif
 		));
-#  if !defined(WIN32) && !defined(O_NONBLOCK)
+#  if !defined(__win32__) && !defined(O_NONBLOCK)
     __END_INTERRUPTABLE__
 #  endif
 #endif
 
-#if defined(WIN32) && !defined(EINPROGRESS)
+#if defined(__win32__) && !defined(EINPROGRESS)
 # define EINPROGRESSS WSAEINPROGRESSS
 # define EALREADY WSAEALREADY
 #endif
@@ -2229,7 +2229,7 @@
     if (ret < 0) {
 # if defined(EINPROGRESS) || defined(EALREADY)
 	if (0
-#  ifdef WIN32
+#  ifdef __win32__
 	    || (errno == WSAEWOULDBLOCK)
 #  endif
 #  ifdef EINPROGRESS
@@ -2265,7 +2265,7 @@
 	}
     }
 
-# ifdef WIN32
+# ifdef __win32__
     {
 	int off = 0;
 	ioctlsocket(sock, FIONBIO, &off);
@@ -2842,7 +2842,7 @@
 	// whether the close() will be successful or not - the handle is invalid now!
 	__INST(handle) = nil;
 	do {
-#ifdef WIN32
+#ifdef __win32__
 	    rslt = __STX_WSA_NOINT_CALL1("closesocket", closesocket, socket);
 #else
 	    rslt = close(socket);
@@ -2910,7 +2910,7 @@
 	sock = SOCKET_FROM_FILE_OBJECT(fp);
 	sz = sizeof(err);
 	if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)(&err), &sz) < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	    errno = WSAGetLastError();
 # endif
 	    err = errno;
@@ -2967,11 +2967,11 @@
     union sockaddr_u sa;
     unsigned int alen;
 
-#ifdef WIN32
+# ifdef __win32__
     serverSocket = SOCKET_FROM_FILE_OBJECT(serverSocketHandle);
-#else
+# else
     serverSocket = __intVal(serverSocketHandle);
-#endif
+# endif
 
 # if defined(O_NONBLOCK) && defined(SET_NDELAY)
     if (blocking == false) {
@@ -3041,7 +3041,7 @@
     /*
      * make it a FILE *
      */
-# ifdef WIN32
+# ifdef __win32__
 #  if 0 && (defined( __BORLANDC__ ) || defined( __MINGW__ ))
     __stxWrapApiEnterCritical();
     _fd = _open_osfhandle((long)newSock, 0);
@@ -3050,7 +3050,7 @@
 #  else
     _fd = (int)newSock;
 #  endif
-# else // ! WIN32
+# else // ! __win32__
     fp = fdopen(newSock, "r+");
     if (! fp) {
 	DBGPRINTF(("SOCKET: fdopen call failed\n"));
@@ -3059,17 +3059,17 @@
 	DBGFPRINTF((stderr, "SOCKET: close (fdopen failed) (%d)\n", newSock));
 	RETURN (false);
     }
-# endif // ! WIN32
+# endif // ! __win32__
 
     if ((@global(FileOpenTrace) == true) || __debugging__) {
-# ifdef WIN32
+# ifdef __win32__
 	console_fprintf(stderr, "fdopen [Socket accept] -> fd: %d (H: %"_lx_")\n", _fd, (INT)newSock);
 # else
 	console_fprintf(stderr, "fdopen [Socket accept] -> %"_lx_" (fd: %d)\n", (INT)fp, newSock);
 # endif
     }
 
-# ifdef WIN32
+# ifdef __win32__
     __externalAddressVal(newHandle) = _fd;
     __INST(handleType) = @symbol(socketHandle);
 # else
@@ -3332,7 +3332,7 @@
 	}
 # endif /* SO_SNDTIMEO */
 
-# if !defined(IPV6_V6ONLY) && defined(WIN32)
+# if !defined(IPV6_V6ONLY) && defined(__win32__)
 #  define IPPROTO_IPV6 41
 #  define IPV6_V6ONLY 27
 # endif
@@ -3345,7 +3345,7 @@
 	    if (arg1 == true) u.u_bool = TRUE;
 	    else if (arg1 == false) u.u_bool = FALSE;
 	    else goto argError;
-#  ifdef WIN32
+#  ifdef __win32__
 	    console_fprintf(stderr, "%d %d %d %d\n", level, opt, usize, u.u_int);
 #  endif
 	}
@@ -3354,15 +3354,13 @@
 	if (usize == -1) goto argError;
 
 	ok = (setsockopt(sock, level, opt, (char *)&u, usize) >= 0) ? true : false;
-	# ifdef WIN32
 	if (ok == false) {
-#  ifdef WIN32
+# ifdef __win32__
 	    error = __mkSmallInteger(WSAGetLastError());
-#  else
+# else
 	    error = __mkSmallInteger(errno);
-#  endif
+# endif
 	}
-# endif
 
     }
 argError: ;
@@ -3477,7 +3475,7 @@
     sock = SOCKET_FROM_FILE_OBJECT(fp);
     ret = getpeername(sock, (struct sockaddr *)&sa, &alen);
     if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	errno = WSAGetLastError();
 # endif
 	DBGPRINTF(("SOCKET: getsocketname failed ret=%d errno=%d\n", ret, errno));
@@ -3551,7 +3549,7 @@
     sock = SOCKET_FROM_FILE_OBJECT(fp);
     ret = getsockname(sock, (struct sockaddr *)&sa, &alen);
     if (ret < 0) {
-# ifdef WIN32
+# ifdef __win32__
 	errno = WSAGetLastError();
 # endif
 	DBGPRINTF(("SOCKET: getsocketname failed ret=%d errno=%d\n", ret, errno));
@@ -3687,7 +3685,7 @@
     SOCKET sock;
     int _fd;
 
-# ifdef WIN32
+# ifdef __win32__
 #  ifndef WSA_FLAG_NO_HANDLE_INHERIT
 #   define WSA_FLAG_NO_HANDLE_INHERIT 0x80
 #  endif
@@ -3716,7 +3714,7 @@
     dom = __intVal(domainCode);
     typ = __intVal(typeCode);
 
-# ifdef WIN32
+# ifdef __win32__
     sock = WSASocket(dom, typ, proto, 0, 0, noInheritFlag);
     if (sock == INVALID_SOCKET && noInheritFlag) {
 	// tried to open socket with WSA_FLAG_NO_HANDLE_INHERIT
@@ -3731,7 +3729,7 @@
     if (sock == INVALID_SOCKET) {
 	errno = WSAGetLastError();
 
-# else  // !WIN32
+# else  // !__win32__
 
     sock = socket(dom, typ, proto);
 # if defined(EPROTONOSUPPORT) /* for SGI */
@@ -3742,7 +3740,7 @@
     }
 # endif
     if (sock < 0) {
-# endif // !WIN32
+# endif // !__win32__
 
 	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
 	error = __MKSMALLINT(errno);
@@ -3756,7 +3754,7 @@
 	    setsockopt( sock, SOL_SOCKET, SO_LINGER, &l, sizeof(l));
 	}
 # endif
-# ifdef WIN32
+# ifdef __win32__
 	/*
 	 * make it blocking
 	 */
@@ -3777,7 +3775,7 @@
 #  endif
 	    DBGPRINTF(("SOCKET: sock=%d fd=%d\n", sock, _fd));
 	}
-# else  // !WIN32
+# else  // !__win32__
 	fp = fdopen(sock, "r+");
 	if (! fp) {
 	    DBGPRINTF(("SOCKET: fdopen call failed\n"));
@@ -3788,17 +3786,17 @@
 	    __END_INTERRUPTABLE__
 	    goto out;
 	}
-# endif // !WIN32
+# endif // !__win32__
 
 	if (@global(FileOpenTrace) == true) {
-# ifdef WIN32
+# ifdef __win32__
 	    console_fprintf(stderr, "fdopen [Socket create] -> fd: %d (H: %"_lx_")\n", (INT)_fd, (INT)sock);
 # else
 	    console_fprintf(stderr, "fdopen [Socket] -> %"_lx_" (fd: %d)\n", (INT)fp, sock);
 # endif
 	}
 
-# ifdef WIN32
+# ifdef __win32__
 	__externalAddressVal(newHandle) = _fd;
 	__INST(handleType) = @symbol(socketHandle);
 # else