diff options
| author | libuv upstream <libuv@googlegroups.com> | 2020-04-06 13:22:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-06 15:49:07 (GMT) |
| commit | 394b07af40e1bdbdca0033e53ca803585454da18 (patch) | |
| tree | 619fd071cfd23622daa4958ddafd18d33b1c1b88 /include/uv | |
| parent | b4069b04ff63b327ff4881282200c3c73fded34d (diff) | |
| download | CMake-394b07af40e1bdbdca0033e53ca803585454da18.zip CMake-394b07af40e1bdbdca0033e53ca803585454da18.tar.gz CMake-394b07af40e1bdbdca0033e53ca803585454da18.tar.bz2 | |
libuv 2020-04-06 (d21f5aea)
Code extracted from:
https://github.com/libuv/libuv.git
at commit d21f5aeab0a4b6193f13640471cde405579f9c69 (v1.x).
Diffstat (limited to 'include/uv')
| -rw-r--r-- | include/uv/errno.h | 5 | ||||
| -rw-r--r-- | include/uv/unix.h | 22 | ||||
| -rw-r--r-- | include/uv/version.h | 4 | ||||
| -rw-r--r-- | include/uv/win.h | 3 |
4 files changed, 28 insertions, 6 deletions
diff --git a/include/uv/errno.h b/include/uv/errno.h index 8eeb95d..165fd11 100644 --- a/include/uv/errno.h +++ b/include/uv/errno.h @@ -439,5 +439,10 @@ # define UV__EFTYPE (-4028) #endif +#if defined(EILSEQ) && !defined(_WIN32) +# define UV__EILSEQ UV__ERR(EILSEQ) +#else +# define UV__EILSEQ (-4027) +#endif #endif /* UV_ERRNO_H_ */ diff --git a/include/uv/unix.h b/include/uv/unix.h index 6c93ee9..3a13163 100644 --- a/include/uv/unix.h +++ b/include/uv/unix.h @@ -49,6 +49,8 @@ # include "uv/linux.h" #elif defined (__MVS__) # include "uv/os390.h" +#elif defined(__PASE__) /* __PASE__ and _AIX are both defined on IBM i */ +# include "uv/posix.h" /* IBM i needs uv/posix.h, not uv/aix.h */ #elif defined(_AIX) # include "uv/aix.h" #elif defined(__sun) @@ -61,8 +63,7 @@ defined(__OpenBSD__) || \ defined(__NetBSD__) # include "uv/bsd.h" -#elif defined(__PASE__) || \ - defined(__CYGWIN__) || \ +#elif defined(__CYGWIN__) || \ defined(__MSYS__) || \ defined(__GNU__) # include "uv/posix.h" @@ -404,11 +405,25 @@ typedef struct { #else # define UV_FS_O_CREAT 0 #endif -#if defined(O_DIRECT) + +#if defined(__linux__) && defined(__arm__) +# define UV_FS_O_DIRECT 0x10000 +#elif defined(__linux__) && defined(__m68k__) +# define UV_FS_O_DIRECT 0x10000 +#elif defined(__linux__) && defined(__mips__) +# define UV_FS_O_DIRECT 0x08000 +#elif defined(__linux__) && defined(__powerpc__) +# define UV_FS_O_DIRECT 0x20000 +#elif defined(__linux__) && defined(__s390x__) +# define UV_FS_O_DIRECT 0x04000 +#elif defined(__linux__) && defined(__x86_64__) +# define UV_FS_O_DIRECT 0x04000 +#elif defined(O_DIRECT) # define UV_FS_O_DIRECT O_DIRECT #else # define UV_FS_O_DIRECT 0 #endif + #if defined(O_DIRECTORY) # define UV_FS_O_DIRECTORY O_DIRECTORY #else @@ -481,6 +496,7 @@ typedef struct { #endif /* fs open() flags supported on other platforms: */ +#define UV_FS_O_FILEMAP 0 #define UV_FS_O_RANDOM 0 #define UV_FS_O_SHORT_LIVED 0 #define UV_FS_O_SEQUENTIAL 0 diff --git a/include/uv/version.h b/include/uv/version.h index 97f0bc2..1536a35 100644 --- a/include/uv/version.h +++ b/include/uv/version.h @@ -31,8 +31,8 @@ */ #define UV_VERSION_MAJOR 1 -#define UV_VERSION_MINOR 29 -#define UV_VERSION_PATCH 2 +#define UV_VERSION_MINOR 35 +#define UV_VERSION_PATCH 1 #define UV_VERSION_IS_RELEASE 0 #define UV_VERSION_SUFFIX "dev" diff --git a/include/uv/win.h b/include/uv/win.h index acbd958..f5f1d3a 100644 --- a/include/uv/win.h +++ b/include/uv/win.h @@ -517,7 +517,7 @@ typedef struct { /* eol conversion state */ \ unsigned char previous_eol; \ /* ansi parser state */ \ - unsigned char ansi_parser_state; \ + unsigned short ansi_parser_state; \ unsigned char ansi_csi_argc; \ unsigned short ansi_csi_argv[4]; \ COORD saved_position; \ @@ -668,6 +668,7 @@ typedef struct { #define UV_FS_O_APPEND _O_APPEND #define UV_FS_O_CREAT _O_CREAT #define UV_FS_O_EXCL _O_EXCL +#define UV_FS_O_FILEMAP 0x20000000 #define UV_FS_O_RANDOM _O_RANDOM #define UV_FS_O_RDONLY _O_RDONLY #define UV_FS_O_RDWR _O_RDWR |