diff options
| -rw-r--r-- | src/nvim/event/socket.c | 2 | ||||
| -rw-r--r-- | src/nvim/os/fs.c | 7 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c index 6fcb9f7e7a..af326f9c82 100644 --- a/src/nvim/event/socket.c +++ b/src/nvim/event/socket.c @@ -169,7 +169,7 @@ void socket_watcher_close(SocketWatcher *watcher, socket_close_cb cb) FUNC_ATTR_NONNULL_ARG(1) { watcher->close_cb = cb; - uv_close((uv_handle_t *)watcher->stream, close_cb); + uv_close(STRUCT_CAST(uv_handle_t, watcher->stream), close_cb); } static void connection_event(void **argv) diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index cead8d802b..99ece275b1 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -649,13 +649,6 @@ int os_fsync(int fd) int r; RUN_UV_FS_FUNC(r, uv_fs_fsync, fd, NULL); g_stats.fsync++; -#ifdef __APPLE__ - // TODO(justinmk): Remove this after it is fixed in libuv. #6725 - if (r == UV_ENOTSUP) { - int rv = fsync(fd); - return rv ? -rv : rv; - } -#endif return r; } diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index f316e5bd0d..b1c8c95b31 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -123,8 +123,8 @@ if(WIN32) set(LIBUV_URL https://github.com/neovim/libuv/archive/0ed7feb71ca949f7a96ccb102481d17ea1bb5933.tar.gz) set(LIBUV_SHA256 813fe763022f19878557c6fde311b6394fb9180caaaab0dd98d8704732234508) else() - set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.23.2.tar.gz) - set(LIBUV_SHA256 30af979c4f4b8d1b895ae6d115f7400c751542ccb9e656350fc89fda08d4eabd) + set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.26.0.tar.gz) + set(LIBUV_SHA256 e414cf74615b7dae768f0f5667092f1d4975f5067c087bcbe0641e241ebe4693) endif() set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0/msgpack-3.0.0.tar.gz) |