diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2014-11-21 15:43:12 +0100 |
|---|---|---|
| committer | Trevor Norris <trev.norris@gmail.com> | 2014-11-26 12:08:36 -0800 |
| commit | 9d9ed61c5a97562b93a2326f33922783ed509d47 (patch) | |
| tree | 702c9dcc3a54bcc7bad26b9b756ddada54795c02 /deps/uv/include/uv.h | |
| parent | 2d17193f20930bfe594d7008fe5c08f813f03c7b (diff) | |
| download | android-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.tar.gz android-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.tar.bz2 android-node-v8-9d9ed61c5a97562b93a2326f33922783ed509d47.zip | |
deps: update libuv to 1.0.0
PR-URL: https://github.com/joyent/node/pull/8762
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/uv/include/uv.h')
| -rw-r--r-- | deps/uv/include/uv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index ad6bde99cb..d17f977b44 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -1138,7 +1138,7 @@ UV_EXTERN int uv_fs_sendfile(uv_loop_t* loop, UV_EXTERN int uv_fs_access(uv_loop_t* loop, uv_fs_t* req, const char* path, - int flags, + int mode, uv_fs_cb cb); UV_EXTERN int uv_fs_chmod(uv_loop_t* loop, uv_fs_t* req, @@ -1369,8 +1369,9 @@ UV_EXTERN void uv_key_set(uv_key_t* key, void* value); typedef void (*uv_thread_cb)(void* arg); UV_EXTERN int uv_thread_create(uv_thread_t* tid, uv_thread_cb entry, void* arg); -UV_EXTERN unsigned long uv_thread_self(void); +UV_EXTERN uv_thread_t uv_thread_self(void); UV_EXTERN int uv_thread_join(uv_thread_t *tid); +UV_EXTERN int uv_thread_equal(const uv_thread_t* t1, const uv_thread_t* t2); /* The presence of these unions force similar struct layout. */ #define XX(_, name) uv_ ## name ## _t name; |