external/nss/UnpackedTarball_nss.mk | 1 + external/nss/connectx.patch.0 | 11 +++++++++++ 2 files changed, 12 insertions(+)
New commits: commit 1edb882cd03a632644f90003e07ca57f4268b053 Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Sep 23 08:20:08 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Tue Sep 23 12:24:15 2025 +0200 external/nss: Fix -Wincompatible-pointer-types ...on macOS, where connectx(2) "appeared in Darwin 15.0.0" according to its man page, and where recent Clang with <https://github.com/llvm/llvm-project/commit/b24769855d97697de08e2296a548c033f193caf4> "[Clang] [Sema] Make `-Wincompatible-pointer-types` an error by default (#157364)" now started to fail with > ../../../../pr/src/pthreads/ptio.c:2046:58: error: incompatible pointer types passing 'PRInt32 *' (aka 'int *') to parameter of type 'size_t *' (aka 'unsigned long *') [-Wincompatible-pointer-types] > 2046 | CONNECT_DATA_IDEMPOTENT, iov, 1, &bytes, NULL); > | ^~~~~~ > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX26.0.sdk/usr/include/sys/socket.h:741:49: note: passing argument to parameter here > 741 | const struct iovec *, unsigned int, size_t *, sae_connid_t *); > | ^ > ../../../../pr/src/pthreads/ptio.c:2045:11: warning: unused variable 'rv' [-Wunused-variable] > 2045 | PRInt32 rv = connectx(fd->secret->md.osfd, &endpoints, SAE_ASSOCID_ANY, > | ^~ Change-Id: I047a987e443ab0283f38d997d03062fe969a65c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191375 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index a33a293f972d..4774e36d0853 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-restore-manual-pre-dependencies.patch.1 \ external/nss/Wincompatible-function-pointer-types.patch.0 \ external/nss/nspr-win95-target.patch \ + external/nss/connectx.patch.0 \ $(if $(filter LINUX,$(OS)), \ external/nss/nss.disablefsync.patch \ external/nss/nss.getrandom.patch) \ diff --git a/external/nss/connectx.patch.0 b/external/nss/connectx.patch.0 new file mode 100644 index 000000000000..29c6fd1a8469 --- /dev/null +++ b/external/nss/connectx.patch.0 @@ -0,0 +1,11 @@ +--- nspr/pr/src/pthreads/ptio.c ++++ nspr/pr/src/pthreads/ptio.c +@@ -1989,7 +1989,7 @@ + PRIntn flags, const PRNetAddr* addr, + PRIntervalTime timeout) { + # if defined(LINUX) || HAS_CONNECTX +- PRInt32 syserrno, bytes = -1; ++ PRInt32 syserrno; ssize_t bytes = -1; + PRBool fNeedContinue = PR_FALSE; + pt_SockLen addr_len; + const PRNetAddr* addrp = addr;
