diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-07 15:48:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-07 15:48:01 (GMT) |
| commit | 42fbb285161a7424116a1e838b29741864ab3691 (patch) | |
| tree | 858d1d7aa84098ce326d32c41da9047d9cd95064 /Utilities/cmlibuv/src/unix/poll.c | |
| parent | dd3e1a737216b7c9bfb6c7569685b36a1bff9cba (diff) | |
| parent | c8b67ea119c4000018238f6c3201a1364356d93a (diff) | |
| download | CMake-42fbb285161a7424116a1e838b29741864ab3691.zip CMake-42fbb285161a7424116a1e838b29741864ab3691.tar.gz CMake-42fbb285161a7424116a1e838b29741864ab3691.tar.bz2 | |
Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
libuv 2018-05-06 (bf605bd7)
Diffstat (limited to 'Utilities/cmlibuv/src/unix/poll.c')
| -rw-r--r-- | Utilities/cmlibuv/src/unix/poll.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/cmlibuv/src/unix/poll.c b/Utilities/cmlibuv/src/unix/poll.c index 816c7dc..f3b0bf4 100644 --- a/Utilities/cmlibuv/src/unix/poll.c +++ b/Utilities/cmlibuv/src/unix/poll.c @@ -47,7 +47,7 @@ static void uv__poll_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) { if ((events & POLLERR) && !(events & UV__POLLPRI)) { uv__io_stop(loop, w, POLLIN | POLLOUT | UV__POLLRDHUP | UV__POLLPRI); uv__handle_stop(handle); - handle->poll_cb(handle, -EBADF, 0); + handle->poll_cb(handle, UV_EBADF, 0); return; } @@ -76,7 +76,7 @@ int uv_poll_init(uv_loop_t* loop, uv_poll_t* handle, int fd) { * Workaround for e.g. kqueue fds not supporting ioctls. */ err = uv__nonblock(fd, 1); - if (err == -ENOTTY) + if (err == UV_ENOTTY) if (uv__nonblock == uv__nonblock_ioctl) err = uv__nonblock_fcntl(fd, 1); |