@@ -440,9 +440,10 @@ int fds_poll_recv(struct fd_data *data, int timeout, int check_signals, void *du

     /* we must have at least one fd, the control fd! */

     fds_cleanup(data);

+#ifndef _WIN32

     if (!data->nfds)

 	return 0;

-

+#endif

     for (i=0;i < data->nfds;i++) {

 	data->buf[i].got_newdata = 0;

     }

@@ -327,12 +327,12 @@ int w32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, s

 }

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

-    int sock;

-    if((sock = (int)accept((SOCKET)sockfd, addr, addrlen)<0)) {

+    SOCKET s;

+    if((s = accept((SOCKET)sockfd, addr, addrlen))==INVALID_SOCKET) {

 	wsock2errno();

 	return -1;

     }

-    return sock;

+    return (int)s;

 }

 int w32_listen(int sockfd, int backlog) {