diff options
author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-25 10:48:29 -0700 |
---|---|---|
committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-07-25 10:48:29 -0700 |
commit | 5c81f41e7094ba3db3df27eb443a4f8521dd48dd (patch) | |
tree | 1d78fbd5617d2baab458a5731c0230e389802606 | |
parent | 4bf52118209753c0c8d48aecb8770e7095c73eee (diff) | |
download | node-5c81f41e7094ba3db3df27eb443a4f8521dd48dd.tar.gz |
uv: Upgrade to v0.10.13
-rw-r--r-- | deps/uv/ChangeLog | 9 | ||||
-rw-r--r-- | deps/uv/include/uv-private/uv-unix.h | 4 | ||||
-rw-r--r-- | deps/uv/include/uv.h | 4 | ||||
-rw-r--r-- | deps/uv/src/unix/fs.c | 8 | ||||
-rw-r--r-- | deps/uv/src/version.c | 2 | ||||
-rw-r--r-- | deps/uv/src/win/fs.c | 8 |
6 files changed, 21 insertions, 14 deletions
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog index ab36a28b2..6ffffc77b 100644 --- a/deps/uv/ChangeLog +++ b/deps/uv/ChangeLog @@ -1,4 +1,11 @@ -2013.07.10, Version 0.10.12 (Stable) +2013.07.26, Version 0.10.13 (Stable) + +Changes since version 0.10.12: + +* unix, windows: fix uv_fs_chown() function prototype (Ben Noordhuis) + + +2013.07.10, Version 0.10.12 (Stable), 58a46221bba726746887a661a9f36fe9ff204209 Changes since version 0.10.11: diff --git a/deps/uv/include/uv-private/uv-unix.h b/deps/uv/include/uv-private/uv-unix.h index 729082e0b..9e83cd88f 100644 --- a/deps/uv/include/uv-private/uv-unix.h +++ b/deps/uv/include/uv-private/uv-unix.h @@ -300,8 +300,8 @@ typedef struct { void* buf; \ size_t len; \ off_t off; \ - uid_t uid; \ - gid_t gid; \ + uv_uid_t uid; \ + uv_gid_t gid; \ double atime; \ double mtime; \ struct uv__work work_req; \ diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index c3c68cbb5..3978def5c 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -1642,10 +1642,10 @@ UV_EXTERN int uv_fs_fchmod(uv_loop_t* loop, uv_fs_t* req, uv_file file, int mode, uv_fs_cb cb); UV_EXTERN int uv_fs_chown(uv_loop_t* loop, uv_fs_t* req, const char* path, - int uid, int gid, uv_fs_cb cb); + uv_uid_t uid, uv_gid_t gid, uv_fs_cb cb); UV_EXTERN int uv_fs_fchown(uv_loop_t* loop, uv_fs_t* req, uv_file file, - int uid, int gid, uv_fs_cb cb); + uv_uid_t uid, uv_gid_t gid, uv_fs_cb cb); enum uv_fs_event { diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c index 2f58a563b..dde1d3a85 100644 --- a/deps/uv/src/unix/fs.c +++ b/deps/uv/src/unix/fs.c @@ -598,8 +598,8 @@ int uv_fs_chmod(uv_loop_t* loop, int uv_fs_chown(uv_loop_t* loop, uv_fs_t* req, const char* path, - int uid, - int gid, + uv_uid_t uid, + uv_gid_t gid, uv_fs_cb cb) { INIT(CHOWN); PATH; @@ -631,8 +631,8 @@ int uv_fs_fchmod(uv_loop_t* loop, int uv_fs_fchown(uv_loop_t* loop, uv_fs_t* req, uv_file file, - int uid, - int gid, + uv_uid_t uid, + uv_gid_t gid, uv_fs_cb cb) { INIT(FCHOWN); req->file = file; diff --git a/deps/uv/src/version.c b/deps/uv/src/version.c index d4ee15e49..1010b2af7 100644 --- a/deps/uv/src/version.c +++ b/deps/uv/src/version.c @@ -34,7 +34,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 -#define UV_VERSION_PATCH 12 +#define UV_VERSION_PATCH 13 #define UV_VERSION_IS_RELEASE 1 diff --git a/deps/uv/src/win/fs.c b/deps/uv/src/win/fs.c index 52290a9f5..e78bc1b80 100644 --- a/deps/uv/src/win/fs.c +++ b/deps/uv/src/win/fs.c @@ -1672,8 +1672,8 @@ int uv_fs_readlink(uv_loop_t* loop, uv_fs_t* req, const char* path, } -int uv_fs_chown(uv_loop_t* loop, uv_fs_t* req, const char* path, int uid, - int gid, uv_fs_cb cb) { +int uv_fs_chown(uv_loop_t* loop, uv_fs_t* req, const char* path, uv_uid_t uid, + uv_gid_t gid, uv_fs_cb cb) { uv_fs_req_init(loop, req, UV_FS_CHOWN, cb); if (fs__capture_path(loop, req, path, NULL, cb != NULL) < 0) { @@ -1691,8 +1691,8 @@ int uv_fs_chown(uv_loop_t* loop, uv_fs_t* req, const char* path, int uid, } -int uv_fs_fchown(uv_loop_t* loop, uv_fs_t* req, uv_file fd, int uid, - int gid, uv_fs_cb cb) { +int uv_fs_fchown(uv_loop_t* loop, uv_fs_t* req, uv_file fd, uv_uid_t uid, + uv_gid_t gid, uv_fs_cb cb) { uv_fs_req_init(loop, req, UV_FS_FCHOWN, cb); if (cb) { |