aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-02-20 21:42:24 +0100
committerJustin M. Keyes <justinkz@gmail.com>2019-02-21 02:00:51 +0100
commitc59aa771a631be53215eaadadfa4589d168a5c2b (patch)
treed0eed122a2c6dccc2c0a6d53ff2b8c021b6e46d8
parent0e97d3d4ee013b6f405bebeb2e4383e39a01d1e1 (diff)
downloadrneovim-c59aa771a631be53215eaadadfa4589d168a5c2b.tar.gz
rneovim-c59aa771a631be53215eaadadfa4589d168a5c2b.tar.bz2
rneovim-c59aa771a631be53215eaadadfa4589d168a5c2b.zip
deps: update to libuv v1.26.0
Notable changes since v1.23.2: - v1.26.0 - uv_os_uname() - unix: don't attempt to invalidate invalid fd https://github.com/libuv/libuv/commit/1ce6393a5780538ad8601cae00c5bd079b9415a9 - v1.25.0 - unix: better handling of unsupported F_FULLFSYNC (fixes #6725) https://github.com/libuv/libuv/commit/6fc797c3fe18d8df71b36ecf2184f085c0283251 - tty,win: fix Alt+key under WSL https://github.com/libuv/libuv/commit/d2e59bb6003d707bdebd7a381f5a7e1d0cc3fd3b - fsevents: really watch files with fsevents on macos 10.7+ https://github.com/libuv/libuv/commit/2d2af382ce84b91d6ee7a185af32fca7f0acd84b - win: fix duplicate tty vt100 fn key - v1.24.0 - win,fs: retry if uv_fs_rename fails https://github.com/libuv/libuv/commit/e94c184c7c4a18f3de569c97caeb83f4ff98a4b2 - later [reverted](https://github.com/libuv/libuv/issues/2098) but may be useful reference - win: support more fine-grained windows hiding https://github.com/libuv/libuv/commit/4c2dcca27b80945d6b7063f0ea031b8a75a46a52
-rw-r--r--src/nvim/event/socket.c2
-rw-r--r--src/nvim/os/fs.c7
-rw-r--r--third-party/CMakeLists.txt4
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)