diff options
| author | cjihrig <cjihrig@gmail.com> | 2017-11-30 21:41:16 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2017-12-01 09:01:04 -0500 |
| commit | 5ebfaa88917ebcef1dd69e31e40014ce237c60e2 (patch) | |
| tree | c3b3e08a1b9a461252992e29f70cbabc26bbd4b3 /deps/uv/include | |
| parent | 3327ce0dd2f1d7d6255deb13314fdd7e7a2fb8aa (diff) | |
| download | android-node-v8-5ebfaa88917ebcef1dd69e31e40014ce237c60e2.tar.gz android-node-v8-5ebfaa88917ebcef1dd69e31e40014ce237c60e2.tar.bz2 android-node-v8-5ebfaa88917ebcef1dd69e31e40014ce237c60e2.zip | |
deps: upgrade libuv to 1.18.0
PR-URL: https://github.com/nodejs/node/pull/17282
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/uv/include')
| -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 | ||||
| -rw-r--r-- | deps/uv/include/uv.h | 1 |
4 files changed, 9 insertions, 6 deletions
diff --git a/deps/uv/include/uv-unix.h b/deps/uv/include/uv-unix.h index 6565ff441e..da32f86e84 100644 --- a/deps/uv/include/uv-unix.h +++ b/deps/uv/include/uv-unix.h @@ -48,6 +48,8 @@ # include "uv-linux.h" #elif defined (__MVS__) # include "uv-os390.h" +#elif defined(_PASE) +# include "uv-posix.h" #elif defined(_AIX) # include "uv-aix.h" #elif defined(__sun) diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h index 1c9113cdc9..831ee54de4 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 16 -#define UV_VERSION_PATCH 1 +#define UV_VERSION_MINOR 18 +#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 be150fc482..b96bed22ac 100644 --- a/deps/uv/include/uv-win.h +++ b/deps/uv/include/uv-win.h @@ -664,13 +664,13 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s); #define UV_FS_O_WRONLY _O_WRONLY /* fs open() flags supported on other platforms (or mapped on this platform): */ -#define UV_FS_O_DIRECT 0x2000000 /* FILE_FLAG_NO_BUFFERING */ +#define UV_FS_O_DIRECT 0x02000000 /* FILE_FLAG_NO_BUFFERING */ #define UV_FS_O_DIRECTORY 0 -#define UV_FS_O_DSYNC 0x4000000 /* FILE_FLAG_WRITE_THROUGH */ -#define UV_FS_O_EXLOCK 0 +#define UV_FS_O_DSYNC 0x04000000 /* FILE_FLAG_WRITE_THROUGH */ +#define UV_FS_O_EXLOCK 0x10000000 /* EXCLUSIVE SHARING MODE */ #define UV_FS_O_NOATIME 0 #define UV_FS_O_NOCTTY 0 #define UV_FS_O_NOFOLLOW 0 #define UV_FS_O_NONBLOCK 0 #define UV_FS_O_SYMLINK 0 -#define UV_FS_O_SYNC 0x8000000 /* FILE_FLAG_WRITE_THROUGH */ +#define UV_FS_O_SYNC 0x08000000 /* FILE_FLAG_WRITE_THROUGH */ diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index 3f61812081..b11666e2e6 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -1070,6 +1070,7 @@ UV_EXTERN int uv_os_homedir(char* buffer, size_t* size); UV_EXTERN int uv_os_tmpdir(char* buffer, size_t* size); UV_EXTERN int uv_os_get_passwd(uv_passwd_t* pwd); UV_EXTERN void uv_os_free_passwd(uv_passwd_t* pwd); +UV_EXTERN uv_pid_t uv_os_getpid(void); UV_EXTERN uv_pid_t uv_os_getppid(void); UV_EXTERN int uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count); |