From: Stefan Weil <sw@weilnetz.de>
Date: Thu, 30 Jul 2015 21:08:12 +0000 (+0200)
Subject: slirp: Fix non blocking connect for w32
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~40^2~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8135f9363e36db19ae4ab141f5850d9e03bbf68;p=sdk%2Femulator%2Fqemu.git

slirp: Fix non blocking connect for w32

Change-Id: Iae869bcf0e25a9842a66f609e552f4b72b69bebf
Signed-off-by: Stefan Weil <sw@weilnetz.de>
(cherry picked from commit 9cf20c1a8d8d128508e80929768cad182c807093)
---

diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c
index f946db8dc0..00a77b4a5f 100644
--- a/slirp/tcp_input.c
+++ b/slirp/tcp_input.c
@@ -584,7 +584,13 @@ findso:
 	    goto cont_input;
 	  }
 
-	  if((tcp_fconnect(so) == -1) && (errno != EINPROGRESS) && (errno != EWOULDBLOCK)) {
+          if ((tcp_fconnect(so) == -1) &&
+#if defined(_WIN32)
+              socket_error() != WSAEWOULDBLOCK
+#else
+              (errno != EINPROGRESS) && (errno != EWOULDBLOCK)
+#endif
+          ) {
 	    u_char code=ICMP_UNREACH_NET;
 	    DEBUG_MISC((dfd, " tcp fconnect errno = %d-%s\n",
 			errno,strerror(errno)));