diff options
author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-01-14 20:26:02 +0100 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2015-01-14 23:52:14 +0100 |
commit | 07bd05ba332e078c1ba76635921f5448a3e884cf (patch) | |
tree | 1c4cf7ac62c5fc430c052eb8fe8c235612a56c52 /deps/uv/src/unix/pipe.c | |
parent | e177377a4bc0cdbaecb8b17a58e57c73b4ca0090 (diff) | |
download | android-node-v8-07bd05ba332e078c1ba76635921f5448a3e884cf.tar.gz android-node-v8-07bd05ba332e078c1ba76635921f5448a3e884cf.tar.bz2 android-node-v8-07bd05ba332e078c1ba76635921f5448a3e884cf.zip |
deps: update libuv to 1.2.1
PR: https://github.com/iojs/io.js/pull/423
Reviewed-by: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-by: Bert Belder <bertbelder@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/pipe.c')
-rw-r--r-- | deps/uv/src/unix/pipe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/uv/src/unix/pipe.c b/deps/uv/src/unix/pipe.c index ef47700b7a..ba833d3f54 100644 --- a/deps/uv/src/unix/pipe.c +++ b/deps/uv/src/unix/pipe.c @@ -125,9 +125,13 @@ void uv__pipe_close(uv_pipe_t* handle) { int uv_pipe_open(uv_pipe_t* handle, uv_file fd) { -#if defined(__APPLE__) int err; + err = uv__nonblock(fd, 1); + if (err) + return err; + +#if defined(__APPLE__) err = uv__stream_try_select((uv_stream_t*) handle, &fd); if (err) return err; |