aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os/fs.c4
-rw-r--r--src/os/os.h2
-rw-r--r--third-party/CMakeLists.txt4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/os/fs.c b/src/os/fs.c
index aa19b2f7f7..cb03a26e2a 100644
--- a/src/os/fs.c
+++ b/src/os/fs.c
@@ -31,12 +31,12 @@ int mch_chdir(char *path) {
* Get name of current directory into buffer 'buf' of length 'len' bytes.
* Return OK for success, FAIL for failure.
*/
-int mch_dirname(char_u *buf, int len)
+int mch_dirname(char_u *buf, size_t len)
{
assert(buf && len);
int errno;
- if ((errno = uv_cwd((char *)buf, len)) != 0) {
+ if ((errno = uv_cwd((char *)buf, &len)) != 0) {
vim_strncpy(buf, (char_u *)uv_strerror(errno), len - 1);
return FAIL;
}
diff --git a/src/os/os.h b/src/os/os.h
index 2bfcd8f162..0a6bb067e2 100644
--- a/src/os/os.h
+++ b/src/os/os.h
@@ -5,7 +5,7 @@
long_u mch_total_mem(int special);
int mch_chdir(char *path);
-int mch_dirname(char_u *buf, int len);
+int mch_dirname(char_u *buf, size_t len);
int mch_get_absolute_path(char_u *fname, char_u *buf, int len, int force);
int mch_is_absolute_path(const char_u *fname);
int mch_isdir(const char_u *name);
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 854a223e96..94747c17a3 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -42,8 +42,8 @@ endif()
include(ExternalProject)
-set(LIBUV_URL https://github.com/joyent/libuv/archive/v0.11.21.tar.gz)
-set(LIBUV_MD5 bc334c8da8618754ce9e2a4c5be73487)
+set(LIBUV_URL https://github.com/joyent/libuv/archive/v0.11.22.tar.gz)
+set(LIBUV_MD5 d0cb0fea847afa35333ccbda56ed16d4)
set(LUAJIT_URL http://luajit.org/download/LuaJIT-2.0.2.tar.gz)
set(LUAJIT_MD5 112dfb82548b03377fbefbba2e0e3a5b)