diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-05 16:10:13 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-05 16:10:13 +0100 |
| commit | f7b06e0bbc21ec865797fe433b3dfcf10dbac819 (patch) | |
| tree | 4f2cef82bf9dec5ce8dafd916b5c8dd979c9fb09 /deps/uv | |
| parent | 862f7b850d7155073b44afd85f8d6974fb500e4d (diff) | |
| download | android-node-v8-f7b06e0bbc21ec865797fe433b3dfcf10dbac819.tar.gz android-node-v8-f7b06e0bbc21ec865797fe433b3dfcf10dbac819.tar.bz2 android-node-v8-f7b06e0bbc21ec865797fe433b3dfcf10dbac819.zip | |
deps: upgrade libuv to 0b26af3
Diffstat (limited to 'deps/uv')
| -rw-r--r-- | deps/uv/src/unix/stream.c | 2 | ||||
| -rw-r--r-- | deps/uv/uv.gyp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index 080535e5f1..8137d24eee 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -1119,7 +1119,7 @@ static void uv__stream_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) { return; } - if (events & UV__POLLIN) { + if (events & (UV__POLLIN | UV__POLLERR | UV__POLLHUP)) { assert(uv__stream_fd(stream) >= 0); uv__read(stream); diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp index 55f1e23943..0810bcc48c 100644 --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp @@ -100,9 +100,11 @@ ], 'link_settings': { 'libraries': [ - '-lws2_32.lib', + '-ladvapi32.lib', + '-liphlpapi.lib', '-lpsapi.lib', - '-liphlpapi.lib' + '-lshell32.lib', + '-lws2_32.lib' ], }, }, { # Not Windows i.e. POSIX |