diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-03-25 11:11:29 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-03-25 14:19:42 -0700 |
| commit | ce0f4b02160ee72d7d2428867fe757bc37c68c98 (patch) | |
| tree | 13dee7797fad78fbde1fcb2869f7b85e26622e39 /android/console.c | |
| parent | ca52b2260ba9f9bac07092c3d8260ed523de1fe1 (diff) | |
| download | external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.zip external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.gz external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.bz2 | |
Fix Win32 socket error handling.
This also fixes -http-proxy support on Windows.
Change-Id: I741b224511c064412ac39351ed4f1b9146a313a5
Diffstat (limited to 'android/console.c')
| -rw-r--r-- | android/console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/console.c b/android/console.c index 45da8aa..fa86151 100644 --- a/android/console.c +++ b/android/console.c @@ -231,7 +231,7 @@ static void control_control_write( ControlClient client, const char* buff, in ret = socket_send( client->sock, buff, len); #endif if (ret < 0) { - if (errno != EINTR && errno != EWOULDBLOCK) + if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) return; } else { buff += ret; @@ -496,7 +496,7 @@ control_client_read( void* _client ) #endif if (size < 0) { D(( "size < 0, exiting with %d: %s\n", errno, errno_str )); - if (errno != EWOULDBLOCK && errno != EINTR) + if (errno != EWOULDBLOCK && errno != EAGAIN && errno != EINTR) control_client_destroy( client ); return; } |