ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '9e0a62487b9946c0403d6c4282010d28ae0b193e':
  Fix Windows socket_network_client.c build failures.
This commit is contained in:
Elliott Hughes 2014-05-19 23:50:28 +00:00 • committed by Android Git Automerger
commit 2dea56e05c
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libcutils/socket_network_client.c
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
}