diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-02-24 21:03:00 +0100 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-02-25 11:52:11 -0600 |
| commit | 739fda16a93cadcefb59190669cfb7765d2fb8fa (patch) | |
| tree | 1d5f67f417248902910f604cc6f227ac1e76ed7a /deps/uv/include | |
| parent | 06ee782f2462f2658ecda600044cf1e2abfdea53 (diff) | |
| download | android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.tar.gz android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.tar.bz2 android-node-v8-739fda16a93cadcefb59190669cfb7765d2fb8fa.zip | |
deps: update libuv to 1.4.1
PR-URL: https://github.com/iojs/io.js/pull/940
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/uv/include')
| -rw-r--r-- | deps/uv/include/uv-errno.h | 16 | ||||
| -rw-r--r-- | deps/uv/include/uv-version.h | 2 | ||||
| -rw-r--r-- | deps/uv/include/uv-win.h | 1 | ||||
| -rw-r--r-- | deps/uv/include/uv.h | 1 |
4 files changed, 19 insertions, 1 deletions
diff --git a/deps/uv/include/uv-errno.h b/deps/uv/include/uv-errno.h index c34132795c..53f30296c1 100644 --- a/deps/uv/include/uv-errno.h +++ b/deps/uv/include/uv-errno.h @@ -399,4 +399,20 @@ # define UV__EMLINK (-4032) #endif +/* EHOSTDOWN is not visible on BSD-like systems when _POSIX_C_SOURCE is + * defined. Fortunately, its value is always 64 so it's possible albeit + * icky to hard-code it. + */ +#if defined(EHOSTDOWN) && !defined(_WIN32) +# define UV__EHOSTDOWN (-EHOSTDOWN) +#elif defined(__APPLE__) || \ + defined(__DragonFly__) || \ + defined(__FreeBSD__) || \ + defined(__NetBSD__) || \ + defined(__OpenBSD__) +# define UV__EHOSTDOWN (-64) +#else +# define UV__EHOSTDOWN (-4031) +#endif + #endif /* UV_ERRNO_H_ */ diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h index 9dc34a4e09..c1a69532a1 100644 --- a/deps/uv/include/uv-version.h +++ b/deps/uv/include/uv-version.h @@ -32,7 +32,7 @@ #define UV_VERSION_MAJOR 1 #define UV_VERSION_MINOR 4 -#define UV_VERSION_PATCH 0 +#define UV_VERSION_PATCH 1 #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 b744d624cb..24b22b31a9 100644 --- a/deps/uv/include/uv-win.h +++ b/deps/uv/include/uv-win.h @@ -294,6 +294,7 @@ typedef struct uv__dirent_s { char d_name[1]; } uv__dirent_t; +#define HAVE_DIRENT_TYPES #define UV__DT_DIR UV_DIRENT_DIR #define UV__DT_FILE UV_DIRENT_FILE #define UV__DT_LINK UV_DIRENT_LINK diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index 191eecacf3..55f75218b5 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -138,6 +138,7 @@ extern "C" { XX(EOF, "end of file") \ XX(ENXIO, "no such device or address") \ XX(EMLINK, "too many links") \ + XX(EHOSTDOWN, "host is down") \ #define UV_HANDLE_TYPE_MAP(XX) \ XX(ASYNC, async) \ |