diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-02-09 21:16:26 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-09 22:07:25 +0100 |
| commit | 9681fcacf0fd477f999a52f6ff4151d4125d49d0 (patch) | |
| tree | b8a3a583daacf82af5b5298961e145b836fa8bfb /deps/uv/src/unix | |
| parent | 5e825d1073b57a87fc9a77751ed3e21c86970082 (diff) | |
| download | android-node-v8-9681fcacf0fd477f999a52f6ff4151d4125d49d0.tar.gz android-node-v8-9681fcacf0fd477f999a52f6ff4151d4125d49d0.tar.bz2 android-node-v8-9681fcacf0fd477f999a52f6ff4151d4125d49d0.zip | |
deps: update libuv to 1.4.0
PR-URL: https://github.com/iojs/io.js/pull/773
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/uv/src/unix')
| -rw-r--r-- | deps/uv/src/unix/stream.c | 5 | ||||
| -rw-r--r-- | deps/uv/src/unix/thread.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index d41a3429a7..bfced40794 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -1573,5 +1573,8 @@ void uv__stream_close(uv_stream_t* handle) { int uv_stream_set_blocking(uv_stream_t* handle, int blocking) { - return UV_ENOSYS; + /* Don't need to check the file descriptor, uv__nonblock() + * will fail with EBADF if it's not valid. + */ + return uv__nonblock(uv__stream_fd(handle), !blocking); } diff --git a/deps/uv/src/unix/thread.c b/deps/uv/src/unix/thread.c index 7a55bd6324..7e85bcc51f 100644 --- a/deps/uv/src/unix/thread.c +++ b/deps/uv/src/unix/thread.c @@ -330,7 +330,7 @@ int uv_cond_init(uv_cond_t* cond) { if (err) return -err; -#if !defined(__ANDROID__) +#if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)) err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); if (err) goto error2; @@ -388,7 +388,7 @@ int uv_cond_timedwait(uv_cond_t* cond, uv_mutex_t* mutex, uint64_t timeout) { timeout += uv__hrtime(UV_CLOCK_PRECISE); ts.tv_sec = timeout / NANOSEC; ts.tv_nsec = timeout % NANOSEC; -#if defined(__ANDROID__) +#if defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC) /* * The bionic pthread implementation doesn't support CLOCK_MONOTONIC, * but has this alternative function instead. |