diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-24 21:03:00 +0100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-02-25 11:52:11 -0600 |
| commit | 739fda16a93cadcefb59190669cfb7765d2fb8fa (patch) | |
| tree | 1d5f67f417248902910f604cc6f227ac1e76ed7a /deps/uv/src/unix/stream.c | |
| parent | 06ee782f2462f2658ecda600044cf1e2abfdea53 (diff) | |
| download | android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.tar.gz android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.tar.bz2 android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.zip | |
deps: update libuv to 1.4.1
PR-URL: https://github.com/iojs/io.js/pull/940
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/uv/src/unix/stream.c')
| -rw-r--r-- | deps/uv/src/unix/stream.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index bfced40794..8d00838fb9 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -375,6 +375,10 @@ failed_malloc: int uv__stream_open(uv_stream_t* stream, int fd, int flags) { +#if defined(__APPLE__) + int enable; +#endif + assert(fd >= 0); stream->flags |= flags; @@ -387,6 +391,14 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) { return -errno; } +#if defined(__APPLE__) + enable = 1; + if (setsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &enable, sizeof(enable)) && + errno != ENOTSOCK) { + return -errno; + } +#endif + stream->io_watcher.fd = fd; return 0; |