From c59aa771a631be53215eaadadfa4589d168a5c2b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 20 Feb 2019 21:42:24 +0100
Subject: 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
---
 src/nvim/event/socket.c | 2 +-
 src/nvim/os/fs.c        | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

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;
 }
 
-- 
cgit