diff options
| author | cjihrig <cjihrig@gmail.com> | 2018-11-12 23:59:52 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2018-11-15 14:52:55 -0500 |
| commit | 9cef7b84b1f6b1e116afaad945f31b368e8917e2 (patch) | |
| tree | 333273bbf34a23e65deea4a85d009b75f2f77e4d /deps/uv/include/uv | |
| parent | 1ddcccb7e379089ac47b87d772343e16fd84c1c8 (diff) | |
| download | android-node-v8-9cef7b84b1f6b1e116afaad945f31b368e8917e2.tar.gz android-node-v8-9cef7b84b1f6b1e116afaad945f31b368e8917e2.tar.bz2 android-node-v8-9cef7b84b1f6b1e116afaad945f31b368e8917e2.zip | |
deps: upgrade to libuv 1.24.0
PR-URL: https://github.com/nodejs/node/pull/24332
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Diffstat (limited to 'deps/uv/include/uv')
| -rw-r--r-- | deps/uv/include/uv/unix.h | 2 | ||||
| -rw-r--r-- | deps/uv/include/uv/version.h | 4 | ||||
| -rw-r--r-- | deps/uv/include/uv/win.h | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/deps/uv/include/uv/unix.h b/deps/uv/include/uv/unix.h index 7208557b56..9de9efecff 100644 --- a/deps/uv/include/uv/unix.h +++ b/deps/uv/include/uv/unix.h @@ -64,6 +64,8 @@ # include "uv/bsd.h" #elif defined(__CYGWIN__) || defined(__MSYS__) # include "uv/posix.h" +#elif defined(__GNU__) +# include "uv/posix.h" #endif #ifndef NI_MAXHOST diff --git a/deps/uv/include/uv/version.h b/deps/uv/include/uv/version.h index cc064e2fd8..105e9a2615 100644 --- a/deps/uv/include/uv/version.h +++ b/deps/uv/include/uv/version.h @@ -31,8 +31,8 @@ */ #define UV_VERSION_MAJOR 1 -#define UV_VERSION_MINOR 23 -#define UV_VERSION_PATCH 2 +#define UV_VERSION_MINOR 24 +#define UV_VERSION_PATCH 0 #define UV_VERSION_IS_RELEASE 1 #define UV_VERSION_SUFFIX "" diff --git a/deps/uv/include/uv/win.h b/deps/uv/include/uv/win.h index d6b8b3a7f7..bb9477c834 100644 --- a/deps/uv/include/uv/win.h +++ b/deps/uv/include/uv/win.h @@ -86,6 +86,14 @@ typedef struct pollfd { #define SIGKILL 9 #define SIGWINCH 28 +/* Redefine NSIG to take SIGWINCH into consideration */ +#if defined(NSIG) && NSIG <= SIGWINCH +# undef NSIG +#endif +#ifndef NSIG +# define NSIG SIGWINCH + 1 +#endif + /* The CRT defines SIGABRT_COMPAT as 6, which equals SIGABRT on many unix-like * platforms. However MinGW doesn't define it, so we do. */ #ifndef SIGABRT_COMPAT |