Merge remote-tracking branch 'upstream/v1.x' into v1.x

zelang-dev · Nov 24, 2023 · 950dc75 · 950dc75
2 parents 38706b6 + a5c01d4
commit 950dc75
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -75,11 +75,5 @@ cmake-build-debug/
 
 # make dist output
 libuv-*.tar.*
-*.cmake
-*.rule
-*.stamp
-*.depend
-CMakeFiles/*
-CMakeCache.txt
-DartConfiguration.tcl
-vendor/
+/dist.libuv.org/
+/libuv-release-tool/
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -4,9 +4,6 @@ libuv is currently managed by the following individuals:
 
 * **Ben Noordhuis** ([@bnoordhuis](https://github.com/bnoordhuis))
   - GPG key: D77B 1E34 243F BAF0 5F8E  9CC3 4F55 C8C8 46AB 89B9 (pubkey-bnoordhuis)
-* **Colin Ihrig** ([@cjihrig](https://github.com/cjihrig))
-  - GPG key: 94AE 3667 5C46 4D64 BAFA  68DD 7434 390B DBE9 B9C5 (pubkey-cjihrig)
-  - GPG key: 5735 3E0D BDAA A7E8 39B6  6A1A FF47 D5E4 AD8B 4FDC (pubkey-cjihrig-kb)
 * **Jameson Nash** ([@vtjnash](https://github.com/vtjnash))
   - GPG key: AEAD 0A4B 6867 6775 1A0E  4AEF 34A2 5FB1 2824 6514 (pubkey-vtjnash)
   - GPG key: CFBB 9CA9 A5BE AFD7 0E2B  3C5A 79A6 7C55 A367 9C8B (pubkey2022-vtjnash)
@@ -27,6 +24,9 @@ libuv is currently managed by the following individuals:
 * **Anna Henningsen** ([@addaleax](https://github.com/addaleax))
 * **Bartosz Sosnowski** ([@bzoz](https://github.com/bzoz))
 * **Bert Belder** ([@piscisaureus](https://github.com/piscisaureus))
+* **Colin Ihrig** ([@cjihrig](https://github.com/cjihrig))
+  - GPG key: 94AE 3667 5C46 4D64 BAFA  68DD 7434 390B DBE9 B9C5 (pubkey-cjihrig)
+  - GPG key: 5735 3E0D BDAA A7E8 39B6  6A1A FF47 D5E4 AD8B 4FDC (pubkey-cjihrig-kb)
 * **Fedor Indutny** ([@indutny](https://github.com/indutny))
   - GPG key: AF2E EA41 EC34 47BF DD86  FED9 D706 3CCE 19B7 E890 (pubkey-indutny)
 * **Imran Iqbal** ([@imran-iq](https://github.com/imran-iq))

diff --git a/src/unix/fs.c b/src/unix/fs.c
@@ -85,7 +85,8 @@
 #if defined(__CYGWIN__) ||                                                    \
     (defined(__HAIKU__) && B_HAIKU_VERSION < B_HAIKU_VERSION_1_PRE_BETA_5) || \
     (defined(__sun) && !defined(__illumos__)) ||                              \
-    (defined(__APPLE__) && MAC_OS_X_VERSION_MIN_REQUIRED <= 101300)
+    (defined(__APPLE__) && !TARGET_OS_IPHONE &&                               \
+     MAC_OS_X_VERSION_MIN_REQUIRED < 110000)
 #define preadv(fd, bufs, nbufs, off)                                          \
   pread(fd, (bufs)->iov_base, (bufs)->iov_len, off)
 #define pwritev(fd, bufs, nbufs, off)                                         \

diff --git a/src/unix/tcp.c b/src/unix/tcp.c
@@ -30,12 +30,8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#if defined(__PASE__)
-#include <as400_protos.h>
-#define ifaddrs ifaddrs_pase
-#define getifaddrs Qp2getifaddrs
-#define freeifaddrs Qp2freeifaddrs
-#else
+/* ifaddrs is not implemented on AIX and IBM i PASE */
+#if !defined(_AIX)
 #include <ifaddrs.h>
 #endif
 
@@ -224,6 +220,10 @@ static int uv__is_ipv6_link_local(const struct sockaddr* addr) {
 
 
 static int uv__ipv6_link_local_scope_id(void) {
+/* disable link local on AIX & PASE for now */
+#if defined(_AIX)
+  return 0;
+#else
   struct sockaddr_in6* a6;
   struct ifaddrs* ifa;
   struct ifaddrs* p;
@@ -245,6 +245,7 @@ static int uv__ipv6_link_local_scope_id(void) {
 
   freeifaddrs(ifa);
   return rv;
+#endif
 }
 
 

diff --git a/test/test-fs.c b/test/test-fs.c
@@ -343,7 +343,7 @@ static void statfs_cb(uv_fs_t* req) {
   defined(__OpenBSD__) || defined(__NetBSD__)
   ASSERT_OK(stats->f_type);
 #else
-  ASSERT_GT(stats->f_type, 0);
+  ASSERT_UINT64_GT(stats->f_type, 0);
 #endif
 
   ASSERT_GT(stats->f_bsize, 0);