diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-20 15:52:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-20 15:52:59 +0000 |
| commit | 51e27f955b79846e36097532a725f4b7a3eefef8 (patch) | |
| tree | 3a971715aacdf906ba86ea9c8649606d30bc27a6 | |
| parent | 9e0a62487b9946c0403d6c4282010d28ae0b193e (diff) | |
| parent | b911cf0af43718a6dedb06561e787ba3bdbdfe8b (diff) | |
| download | system_core-51e27f955b79846e36097532a725f4b7a3eefef8.zip system_core-51e27f955b79846e36097532a725f4b7a3eefef8.tar.gz system_core-51e27f955b79846e36097532a725f4b7a3eefef8.tar.bz2 | |
Merge "Fix win32 implicit declaration of function socket_network_client_timeout."
| -rw-r--r-- | adb/sysdeps.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 4033b72..ba4306f 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -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); |