From 0bff5bd95268184a34ae69c062584a8d1f4d87fb Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 20 May 2014 12:01:29 -0700
Subject: [PATCH] Fix win32 undefined reference to
 `_socket_network_client_timeout'.

Change-Id: I063213957b8452f4690da0f64872075f7c27b4cd
---
 adb/sysdeps_win32.c               |  7 +++++++
 libcutils/Android.mk              | 17 +++++++++--------
 libcutils/socket_network_client.c | 10 ----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c
index b0cb0488d..29f58ec08 100644
--- a/adb/sysdeps_win32.c
+++ b/adb/sysdeps_win32.c
@@ -701,6 +701,13 @@ int socket_network_client(const char *host, int port, int type)
 }
 
 
+int socket_network_client_timeout(const char *host, int port, int type, int timeout)
+{
+    // TODO: implement timeouts for Windows.
+    return socket_network_client(host, port, type);
+}
+
+
 int socket_inaddr_any_server(int port, int type)
 {
     FH  f = _fh_alloc( &_fh_socket_class );
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 945ebdd7f..e1d6f49f9 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -27,13 +27,6 @@ commonSources := \
 	hashmap.c \
 	atomic.c.arm \
 	native_handle.c \
-	socket_inaddr_any_server.c \
-	socket_local_client.c \
-	socket_local_server.c \
-	socket_loopback_client.c \
-	socket_loopback_server.c \
-	socket_network_client.c \
-	sockets.c \
 	config_utils.c \
 	cpu_info.c \
 	load_file.c \
@@ -67,7 +60,15 @@ endif
 ifneq ($(WINDOWS_HOST_ONLY),1)
     commonSources += \
         fs.c \
-        multiuser.c
+        multiuser.c \
+	socket_inaddr_any_server.c \
+	socket_local_client.c \
+	socket_local_server.c \
+	socket_loopback_client.c \
+	socket_loopback_server.c \
+	socket_network_client.c \
+	sockets.c \
+
 endif
 
 
diff --git a/libcutils/socket_network_client.c b/libcutils/socket_network_client.c
index 8a8474e3b..48260330e 100644
--- a/libcutils/socket_network_client.c
+++ b/libcutils/socket_network_client.c
@@ -21,13 +21,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#ifndef HAVE_WINSOCK
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#endif
 
 #include <cutils/sockets.h>
 
@@ -68,13 +66,6 @@ int socket_network_client_timeout(const char *host, int port, int type, int time
     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;
@@ -132,5 +123,4 @@ done:
     }
 
     return s;
-#endif
 }