commit 2dea56e05c45c1a16232152dec239c2506ab6d97
author Elliott Hughes <enh@google.com> Mon May 19 23:50:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 19 23:50:28 2014 +0000
tree 5bdb4469de6e63f0cdb15348716ef7816ade4525
parent 0e71e3ab9cf66f41645ea286c7e62ed2b657ca38
parent 9e0a62487b9946c0403d6c4282010d28ae0b193e

am 9e0a6248: Merge "Fix Windows socket_network_client.c build failures."

* commit '9e0a62487b9946c0403d6c4282010d28ae0b193e':
  Fix Windows socket_network_client.c build failures.

libcutils/socket_network_client.c

diff --git a/libcutils/socket_network_client.c b/libcutils/socket_network_client.c
index 4862949..8a8474e 100644
--- a/libcutils/socket_network_client.c
+++ b/libcutils/socket_network_client.c
@@ -68,6 +68,13 @@
     s = socket(hp->h_addrtype, type, 0);
     if (s < 0) return -1;
 
+#ifdef HAVE_WINSOCK
+    if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+        close(s);
+        return -1;
+    }
+    return s;
+#else
     if ((flags = fcntl(s, F_GETFL, 0)) < 0) {
         close(s);
         return -1;
@@ -125,5 +132,5 @@
     }
 
     return s;
+#endif
 }
-