diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-20 19:21:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 19:21:36 +0000 |
| commit | 6dfb039b0ba56576b4ed043e02ae43fb6afd42aa (patch) | |
| tree | 33be7d873f263d6a775294b0641f6474aa233a49 /adb | |
| parent | 7563a601e47db0a7c429fff1776f8a17a6157ce0 (diff) | |
| parent | 4a343436e01b07c21c043f8a903689f70000ca73 (diff) | |
| download | system_core-6dfb039b0ba56576b4ed043e02ae43fb6afd42aa.tar.gz system_core-6dfb039b0ba56576b4ed043e02ae43fb6afd42aa.tar.bz2 system_core-6dfb039b0ba56576b4ed043e02ae43fb6afd42aa.zip | |
am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
* commit '4a343436e01b07c21c043f8a903689f70000ca73':
Fix win32 undefined reference to `_socket_network_client_timeout'.
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/sysdeps_win32.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/adb/sysdeps_win32.c b/adb/sysdeps_win32.c index b0cb0488d..29f58ec08 100644 --- a/adb/sysdeps_win32.c +++ b/adb/sysdeps_win32.c @@ -701,6 +701,13 @@ int socket_network_client(const char *host, int port, int type) } +int socket_network_client_timeout(const char *host, int port, int type, int timeout) +{ + // TODO: implement timeouts for Windows. + return socket_network_client(host, port, type); +} + + int socket_inaddr_any_server(int port, int type) { FH f = _fh_alloc( &_fh_socket_class ); |