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

* commit '2dea56e05c45c1a16232152dec239c2506ab6d97':
  Fix Windows socket_network_client.c build failures.
This commit is contained in:
Elliott Hughes 2014-05-20 00:00:09 +00:00 committed by Android Git Automerger
commit 87d0f45b3c

View file

@ -68,6 +68,13 @@ 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;
@ -125,5 +132,5 @@ done:
}
return s;
#endif
}