am 51e27f95: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."

* commit '51e27f955b79846e36097532a725f4b7a3eefef8':
  Fix win32 implicit declaration of function socket_network_client_timeout.
This commit is contained in:
Elliott Hughes 2014-05-20 15:55:43 +00:00 committed by Android Git Automerger
commit 796b20157f

View file

@ -169,6 +169,8 @@ extern void* load_file(const char* pathname, unsigned* psize);
/* normally provided by <cutils/sockets.h> */
extern int socket_loopback_client(int port, int type);
extern int socket_network_client(const char *host, int port, int type);
extern int socket_network_client_timeout(const char *host, int port, int type,
int timeout);
extern int socket_loopback_server(int port, int type);
extern int socket_inaddr_any_server(int port, int type);