diff options
| author | cjihrig <cjihrig@gmail.com> | 2017-05-30 13:19:11 -0400 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2017-06-07 09:30:01 -0400 |
| commit | edd541957f6bb6fa4ccb56bd1f878172f631ce36 (patch) | |
| tree | 2a72ce78b05fc122c699d547152414f45d2cc16c /deps/uv/include/uv-unix.h | |
| parent | 12e39d6d943348a19da1bf84d4891aa28cd3ffb6 (diff) | |
| download | android-node-v8-edd541957f6bb6fa4ccb56bd1f878172f631ce36.tar.gz android-node-v8-edd541957f6bb6fa4ccb56bd1f878172f631ce36.tar.bz2 android-node-v8-edd541957f6bb6fa4ccb56bd1f878172f631ce36.zip | |
deps: upgrade libuv to 1.12.0
Fixes: https://github.com/nodejs/node/issues/12853
Fixes: https://github.com/nodejs/node/issues/854
PR-URL: https://github.com/nodejs/node/pull/13306
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/uv/include/uv-unix.h')
| -rw-r--r-- | deps/uv/include/uv-unix.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/deps/uv/include/uv-unix.h b/deps/uv/include/uv-unix.h index 3030f719a2..d7754509b1 100644 --- a/deps/uv/include/uv-unix.h +++ b/deps/uv/include/uv-unix.h @@ -60,6 +60,8 @@ defined(__OpenBSD__) || \ defined(__NetBSD__) # include "uv-bsd.h" +#elif defined(__CYGWIN__) || defined(__MSYS__) +# include "uv-posix.h" #endif #ifndef PTHREAD_BARRIER_SERIAL_THREAD @@ -79,7 +81,6 @@ #endif struct uv__io_s; -struct uv__async; struct uv_loop_s; typedef void (*uv__io_cb)(struct uv_loop_s* loop, @@ -97,16 +98,6 @@ struct uv__io_s { UV_IO_PRIVATE_PLATFORM_FIELDS }; -typedef void (*uv__async_cb)(struct uv_loop_s* loop, - struct uv__async* w, - unsigned int nevents); - -struct uv__async { - uv__async_cb cb; - uv__io_t io_watcher; - int wfd; -}; - #ifndef UV_PLATFORM_SEM_T # define UV_PLATFORM_SEM_T sem_t #endif @@ -216,7 +207,9 @@ typedef struct { void* check_handles[2]; \ void* idle_handles[2]; \ void* async_handles[2]; \ - struct uv__async async_watcher; \ + void (*async_unused)(void); /* TODO(bnoordhuis) Remove in libuv v2. */ \ + uv__io_t async_io_watcher; \ + int async_wfd; \ struct { \ void* min; \ unsigned int nelts; \ |