diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-20 15:55:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 15:55:43 +0000 |
| commit | 796b20157f75e46ad91b7d894796e0ba55a7766e (patch) | |
| tree | df938309c9ade4a47c5d932d313b3bd98c0d4e1b /adb | |
| parent | 2dea56e05c45c1a16232152dec239c2506ab6d97 (diff) | |
| parent | 51e27f955b79846e36097532a725f4b7a3eefef8 (diff) | |
| download | system_core-796b20157f75e46ad91b7d894796e0ba55a7766e.tar.gz system_core-796b20157f75e46ad91b7d894796e0ba55a7766e.tar.bz2 system_core-796b20157f75e46ad91b7d894796e0ba55a7766e.zip | |
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.
Diffstat (limited to 'adb')
| -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 4033b7220..ba4306f8c 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); |