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
This commit is contained in:
Kai Engert
2024-10-07 15:46:14 +00:00
parent 2c973f0ae9
commit 116324cbfe
3 changed files with 3 additions and 4 deletions

View File

@@ -1 +1 @@
NSPR_4_36_BETA1 NSPR_4_36_BETA2

View File

@@ -10,4 +10,3 @@
*/ */
#error "Do not include this header file." #error "Do not include this header file."

View File

@@ -58,8 +58,8 @@ PRLock* _pr_dnsLock = NULL;
* an int, and glibc's flavor takes five arguments. * an int, and glibc's flavor takes five arguments.
*/ */
#if defined(SOLARIS) #if defined(SOLARIS) \
|| (defined(LINUX) && defined(_REENTRANT) && defined(__GLIBC__) && || (defined(LINUX) && defined(_REENTRANT) && defined(__GLIBC__) && \
__GLIBC__ < 2) __GLIBC__ < 2)
# define _PR_HAVE_GETPROTO_R # define _PR_HAVE_GETPROTO_R
# define _PR_HAVE_GETPROTO_R_POINTER # define _PR_HAVE_GETPROTO_R_POINTER