diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-17 11:40:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-17 11:40:02 (GMT) |
| commit | 74a05716a453d1cffbba4a1b300c7cafea17b8f5 (patch) | |
| tree | a8b1b793607796938219d94a57ba4ce2924e3c8f /Utilities/cmlibuv/include/uv | |
| parent | 65fb29fdfbe1663fe0f050214c43bf24238fbbfe (diff) | |
| parent | 27e34e6190ba1014c20ef5e8ffa7d653595ced12 (diff) | |
| download | CMake-74a05716a453d1cffbba4a1b300c7cafea17b8f5.zip CMake-74a05716a453d1cffbba4a1b300c7cafea17b8f5.tar.gz CMake-74a05716a453d1cffbba4a1b300c7cafea17b8f5.tar.bz2 | |
Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
libuv 2021-11-09 (0f696da5)
Diffstat (limited to 'Utilities/cmlibuv/include/uv')
| -rw-r--r-- | Utilities/cmlibuv/include/uv/errno.h | 14 | ||||
| -rw-r--r-- | Utilities/cmlibuv/include/uv/tree.h | 2 | ||||
| -rw-r--r-- | Utilities/cmlibuv/include/uv/unix.h | 6 | ||||
| -rw-r--r-- | Utilities/cmlibuv/include/uv/version.h | 2 | ||||
| -rw-r--r-- | Utilities/cmlibuv/include/uv/win.h | 7 |
5 files changed, 24 insertions, 7 deletions
diff --git a/Utilities/cmlibuv/include/uv/errno.h b/Utilities/cmlibuv/include/uv/errno.h index 8d4d768..71906b3 100644 --- a/Utilities/cmlibuv/include/uv/errno.h +++ b/Utilities/cmlibuv/include/uv/errno.h @@ -317,7 +317,7 @@ #if defined(EPROTO) && !defined(_WIN32) # define UV__EPROTO UV__ERR(EPROTO) #else -# define UV__EPROTO UV__ERR(-4046) +# define UV__EPROTO (-4046) #endif #if defined(EPROTONOSUPPORT) && !defined(_WIN32) @@ -445,4 +445,16 @@ # define UV__EILSEQ (-4027) #endif +#if defined(EOVERFLOW) && !defined(_WIN32) +# define UV__EOVERFLOW UV__ERR(EOVERFLOW) +#else +# define UV__EOVERFLOW (-4026) +#endif + +#if defined(ESOCKTNOSUPPORT) && !defined(_WIN32) +# define UV__ESOCKTNOSUPPORT UV__ERR(ESOCKTNOSUPPORT) +#else +# define UV__ESOCKTNOSUPPORT (-4025) +#endif + #endif /* UV_ERRNO_H_ */ diff --git a/Utilities/cmlibuv/include/uv/tree.h b/Utilities/cmlibuv/include/uv/tree.h index f936416..2b28835 100644 --- a/Utilities/cmlibuv/include/uv/tree.h +++ b/Utilities/cmlibuv/include/uv/tree.h @@ -251,7 +251,7 @@ void name##_SPLAY_MINMAX(struct name *head, int __comp) \ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL; \ __left = __right = &__node; \ \ - while (1) { \ + for (;;) { \ if (__comp < 0) { \ __tmp = SPLAY_LEFT((head)->sph_root, field); \ if (__tmp == NULL) \ diff --git a/Utilities/cmlibuv/include/uv/unix.h b/Utilities/cmlibuv/include/uv/unix.h index a59192f..7a5a3cb 100644 --- a/Utilities/cmlibuv/include/uv/unix.h +++ b/Utilities/cmlibuv/include/uv/unix.h @@ -72,12 +72,10 @@ # include "bsd.h" #elif defined(__CYGWIN__) || \ defined(__MSYS__) || \ + defined(__HAIKU__) || \ + defined(__QNX__) || \ defined(__GNU__) # include "posix.h" -#elif defined(__HAIKU__) -# include "posix.h" -#elif defined(__QNX__) -# include "posix.h" #endif #ifndef NI_MAXHOST diff --git a/Utilities/cmlibuv/include/uv/version.h b/Utilities/cmlibuv/include/uv/version.h index 96c1c13..ab5ed00 100644 --- a/Utilities/cmlibuv/include/uv/version.h +++ b/Utilities/cmlibuv/include/uv/version.h @@ -31,7 +31,7 @@ */ #define UV_VERSION_MAJOR 1 -#define UV_VERSION_MINOR 39 +#define UV_VERSION_MINOR 42 #define UV_VERSION_PATCH 1 #define UV_VERSION_IS_RELEASE 0 #define UV_VERSION_SUFFIX "dev" diff --git a/Utilities/cmlibuv/include/uv/win.h b/Utilities/cmlibuv/include/uv/win.h index f86357b..9b5d5dc 100644 --- a/Utilities/cmlibuv/include/uv/win.h +++ b/Utilities/cmlibuv/include/uv/win.h @@ -45,7 +45,14 @@ typedef struct pollfd { #endif #include <mswsock.h> +// Disable the typedef in mstcpip.h of MinGW. +#define _TCP_INITIAL_RTO_PARAMETERS _TCP_INITIAL_RTO_PARAMETERS__AVOID +#define TCP_INITIAL_RTO_PARAMETERS TCP_INITIAL_RTO_PARAMETERS__AVOID +#define PTCP_INITIAL_RTO_PARAMETERS PTCP_INITIAL_RTO_PARAMETERS__AVOID #include <ws2tcpip.h> +#undef _TCP_INITIAL_RTO_PARAMETERS +#undef TCP_INITIAL_RTO_PARAMETERS +#undef PTCP_INITIAL_RTO_PARAMETERS #include <windows.h> #include <process.h> |