From 116324cbfe38644a86300d8530503c421e133c72 Mon Sep 17 00:00:00 2001 From: Kai Engert Date: Mon, 7 Oct 2024 15:46:14 +0000 Subject: [PATCH] Bug 1920969 - Land NSPR_4_36_BETA2. r=sylvestre UPGRADE_NSPR_RELEASE DONTBUILD Changes since beta1 affect Solaris, only. Differential Revision: https://phabricator.services.mozilla.com/D224749 --- nsprpub/TAG-INFO | 2 +- nsprpub/config/prdepend.h | 1 - nsprpub/pr/src/misc/prnetdb.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO index daffc5570b55..64e7dcf44c9c 100644 --- a/nsprpub/TAG-INFO +++ b/nsprpub/TAG-INFO @@ -1 +1 @@ -NSPR_4_36_BETA1 \ No newline at end of file +NSPR_4_36_BETA2 \ No newline at end of file diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h index 6c66b37ca0fc..e49e92677e3e 100644 --- a/nsprpub/config/prdepend.h +++ b/nsprpub/config/prdepend.h @@ -10,4 +10,3 @@ */ #error "Do not include this header file." - diff --git a/nsprpub/pr/src/misc/prnetdb.c b/nsprpub/pr/src/misc/prnetdb.c index 18f1cf4ecce9..3438e3063476 100644 --- a/nsprpub/pr/src/misc/prnetdb.c +++ b/nsprpub/pr/src/misc/prnetdb.c @@ -58,8 +58,8 @@ PRLock* _pr_dnsLock = NULL; * an int, and glibc's flavor takes five arguments. */ -#if defined(SOLARIS) -|| (defined(LINUX) && defined(_REENTRANT) && defined(__GLIBC__) && +#if defined(SOLARIS) \ +|| (defined(LINUX) && defined(_REENTRANT) && defined(__GLIBC__) && \ __GLIBC__ < 2) # define _PR_HAVE_GETPROTO_R # define _PR_HAVE_GETPROTO_R_POINTER