diff options
author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2015-01-28 22:14:19 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-28 22:47:38 +0100 |
commit | 097fde7129a3acc660beb372cecd9daf1164a7f2 (patch) | |
tree | 2bb1b2fb58b314f739df4ac91b0d60bee9c21277 /deps/uv/include/uv.h | |
parent | 6ad236c9b6a344a88ec2f1f173d5f920984b77b7 (diff) | |
download | android-node-v8-097fde7129a3acc660beb372cecd9daf1164a7f2.tar.gz android-node-v8-097fde7129a3acc660beb372cecd9daf1164a7f2.tar.bz2 android-node-v8-097fde7129a3acc660beb372cecd9daf1164a7f2.zip |
deps: update libuv to 1.3.0
PR-URL: https://github.com/iojs/io.js/pull/644
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/uv/include/uv.h')
-rw-r--r-- | deps/uv/include/uv.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index a2332504ca..191eecacf3 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -675,8 +675,11 @@ UV_EXTERN void uv_pipe_connect(uv_connect_t* req, const char* name, uv_connect_cb cb); UV_EXTERN int uv_pipe_getsockname(const uv_pipe_t* handle, - char* buf, - size_t* len); + char* buffer, + size_t* size); +UV_EXTERN int uv_pipe_getpeername(const uv_pipe_t* handle, + char* buffer, + size_t* size); UV_EXTERN void uv_pipe_pending_instances(uv_pipe_t* handle, int count); UV_EXTERN int uv_pipe_pending_count(uv_pipe_t* handle); UV_EXTERN uv_handle_type uv_pipe_pending_type(uv_pipe_t* handle); @@ -772,6 +775,7 @@ struct uv_getaddrinfo_s { UV_REQ_FIELDS /* read-only */ uv_loop_t* loop; + /* struct addrinfo* addrinfo is marked as private, but it really isn't. */ UV_GETADDRINFO_PRIVATE_FIELDS }; @@ -1260,7 +1264,9 @@ UV_EXTERN int uv_fs_poll_start(uv_fs_poll_t* handle, const char* path, unsigned int interval); UV_EXTERN int uv_fs_poll_stop(uv_fs_poll_t* handle); -UV_EXTERN int uv_fs_poll_getpath(uv_fs_poll_t* handle, char* buf, size_t* len); +UV_EXTERN int uv_fs_poll_getpath(uv_fs_poll_t* handle, + char* buffer, + size_t* size); struct uv_signal_s { @@ -1317,8 +1323,8 @@ UV_EXTERN int uv_fs_event_start(uv_fs_event_t* handle, unsigned int flags); UV_EXTERN int uv_fs_event_stop(uv_fs_event_t* handle); UV_EXTERN int uv_fs_event_getpath(uv_fs_event_t* handle, - char* buf, - size_t* len); + char* buffer, + size_t* size); UV_EXTERN int uv_ip4_addr(const char* ip, int port, struct sockaddr_in* addr); UV_EXTERN int uv_ip6_addr(const char* ip, int port, struct sockaddr_in6* addr); |