diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-20 19:24:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 19:24:31 +0000 |
| commit | f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d (patch) | |
| tree | cabb85f7d44f6dc1d0100a6f5d3af8cb82cd8db9 /adb | |
| parent | cbe7544a3e848872def9cbf67110c78aa21d8ab1 (diff) | |
| parent | 6dfb039b0ba56576b4ed043e02ae43fb6afd42aa (diff) | |
| download | system_core-f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d.zip system_core-f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d.tar.gz system_core-f7a7e3c301fdf7d98d8bcabf6fefb0fcf5bbf90d.tar.bz2 | |
am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
* commit '6dfb039b0ba56576b4ed043e02ae43fb6afd42aa':
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 b0cb048..29f58ec 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 ); |