From bc714b6d7ffced2dc5ea10e5178b4f85ea47905a Mon Sep 17 00:00:00 2001 From: barracuda156 Date: Mon, 6 Nov 2023 02:10:16 +0800 Subject: [PATCH] Unbreak libuv --- deps/uv/src/unix/darwin-proctitle.c | 2 ++ deps/uv/src/unix/udp.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git deps/uv/src/unix/darwin-proctitle.c deps/uv/src/unix/darwin-proctitle.c index 5288083ef0..c1aa053126 100644 --- a/deps/uv/src/unix/darwin-proctitle.c +++ b/deps/uv/src/unix/darwin-proctitle.c @@ -41,9 +41,11 @@ static int uv__pthread_setname_np(const char* name) { strncpy(namebuf, name, sizeof(namebuf) - 1); namebuf[sizeof(namebuf) - 1] = '\0'; +#if TARGET_OS_IPHONE || (MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) err = pthread_setname_np(namebuf); if (err) return UV__ERR(err); +#endif return 0; } diff --git deps/uv/src/unix/udp.c deps/uv/src/unix/udp.c index 7d699a1675..d34c4b3d9b 100644 --- a/deps/uv/src/unix/udp.c +++ b/deps/uv/src/unix/udp.c @@ -31,6 +31,9 @@ #include #endif #include +#if defined(__APPLE__) +#include +#endif #define UV__UDP_DGRAM_MAXSIZE (64 * 1024) @@ -854,7 +857,7 @@ } -#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) +#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) static int uv__udp_set_source_membership4(uv_udp_t* handle, const struct sockaddr_in* multicast_addr, const char* interface_addr, @@ -1031,7 +1034,7 @@ const char* interface_addr, const char* source_addr, uv_membership membership) { -#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) +#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__ANDROID__) && (!defined(__APPLE__) || (MAC_OS_X_VERSION_MAX_ALLOWED >= 1070)) int err; union uv__sockaddr mcast_addr; union uv__sockaddr src_addr;