@@ -387,10 +387,6 @@ static void *acceptloop_th(void *arg)

 	    if (new_sd >= 0) {

 		int ret, flags;

-#ifdef _WIN32

-		if(sock_set_nonblock(new_sd))

-		    logg("^Can't set socket to nonblocking mode, errno %d\n", errno);

-#else

 #ifdef F_GETFL

 		flags = fcntl(new_sd, F_GETFL, 0);

 		if (flags != -1) {

@@ -404,7 +400,6 @@ static void *acceptloop_th(void *arg)

 #else

 		logg("^Nonblocking sockets not available!\n");

 #endif

-#endif

 		logg("$Got new connection, FD %d\n", new_sd);

 		pthread_mutex_lock(recv_fds->buf_mutex);

 		ret = fds_add(recv_fds, new_sd, 0, commandtimeout);

@@ -350,15 +350,6 @@ int w32_shutdown(int sockfd, int how) {

     return 0;

 }

-int sock_set_nonblock(int sockfd) {

-    u_long arg = 1;

-    if(ioctlsocket((SOCKET)sockfd, FIONBIO, &arg)) {

-	wsock2errno();

-	return -1;

-    }

-    return 0;

-}

-

 struct w32polldata {

     HANDLE setme;

     HANDLE event;

@@ -459,3 +450,21 @@ int poll_with_event(struct pollfd *fds, int nfds, int timeout, HANDLE event) {

     free(setme);

     return ret;

 }

+

+int fcntl(int fd, int cmd, ...) {

+    va_list ap;

+    va_start(ap, cmd);

+

+    if(cmd == F_GETFL)

+	    return 0;

+    if(cmd == F_SETFL) {

+	u_long arg = va_arg(ap, long) == O_NONBLOCK;

+	if(ioctlsocket((SOCKET)fd, FIONBIO, &arg)) {

+	    wsock2errno();

+	    return -1;

+	}

+	return 0;

+    }

+    return -1;

+}

+

@@ -24,6 +24,10 @@

 typedef int socklen_t;

 typedef int ssize_t;

+#define F_GETFL 1

+#define F_SETFL 2

+#define O_NONBLOCK 1

+

 int w32_socket(int domain, int type, int protocol);

 int w32_getsockopt(int sockfd, int level, int optname, void *optval, socklen_t *optlen);

 int w32_setsockopt(int sockfd, int level, int optname, const void *optval, socklen_t optlen);

@@ -43,6 +47,6 @@ int poll_with_event(struct pollfd *fds, int nfds, int timeout, HANDLE event);

 int w32_accept(SOCKET sockfd, const struct sockaddr *addr, socklen_t *addrlen);

 int w32_listen(int sockfd, int backlog);

 int w32_shutdown(int sockfd, int how);

-int sock_set_nonblock(int sockfd);

+int fcntl(int fd, int cmd, ...);

 #endif

@@ -195,4 +195,4 @@ EXPORTS w32_stat @44331 NONAME

 EXPORTS w32_strerror @44332 NONAME

 EXPORTS w32_strerror_r @44333 NONAME

 EXPORTS inet_addr @44334 NONAME

-EXPORTS sock_set_nonblock @44335 NONAME

+EXPORTS fcntl @44335 NONAME