mirror of
https://git.freebsd.org/ports.git
synced 2025-06-17 18:50:33 -04:00
f4dbd4362b
Changes: http://mozilla.6506.n7.nabble.com/ANNOUNCE-NSPR-4-12-Release-td351657.html MFH: 2016Q1 (required by nss-3.22.1)
63 lines
2.1 KiB
Text
63 lines
2.1 KiB
Text
--- pr/include/prcountr.h.orig 2015-10-16 13:22:19 UTC
|
|
+++ pr/include/prcountr.h
|
|
@@ -394,7 +394,7 @@ NSPR_API(void)
|
|
#define PR_GET_COUNTER(counter,handle)\
|
|
(counter) = PR_GetCounter((handle))
|
|
#else
|
|
-#define PR_GET_COUNTER(counter,handle) 0
|
|
+#define PR_GET_COUNTER(counter,handle)
|
|
#endif
|
|
|
|
NSPR_API(PRUint32)
|
|
@@ -468,7 +468,7 @@ NSPR_API(void)
|
|
#define PR_FIND_NEXT_COUNTER_QNAME(next,handle)\
|
|
(next) = PR_FindNextCounterQname((handle))
|
|
#else
|
|
-#define PR_FIND_NEXT_COUNTER_QNAME(next,handle) NULL
|
|
+#define PR_FIND_NEXT_COUNTER_QNAME(next,handle)
|
|
#endif
|
|
|
|
NSPR_API(PRCounterHandle)
|
|
--- pr/src/misc/pralarm.c.orig 2015-10-16 13:22:19 UTC
|
|
+++ pr/src/misc/pralarm.c
|
|
@@ -101,7 +101,7 @@ static void PR_CALLBACK pr_alarmNotifier
|
|
|
|
while (why != abort)
|
|
{
|
|
- PRIntervalTime pause;
|
|
+ PRIntervalTime pause = 0;
|
|
|
|
PR_Lock(alarm->lock);
|
|
while (why == scan)
|
|
--- pr/src/misc/prdtoa.c.orig 2015-10-16 13:22:19 UTC
|
|
+++ pr/src/misc/prdtoa.c
|
|
@@ -2751,7 +2751,7 @@ dtoa
|
|
to hold the suppressed trailing zeros.
|
|
*/
|
|
|
|
- int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
|
|
+ int bbits, b2, b5, be, dig, i, ieps, ilim = -1, ilim0, ilim1 = -1,
|
|
j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
|
|
spec_case, try_quick;
|
|
Long L;
|
|
--- pr/src/pthreads/ptio.c.orig 2015-10-16 13:22:19 UTC
|
|
+++ pr/src/pthreads/ptio.c
|
|
@@ -4934,6 +4934,7 @@ PR_IMPLEMENT(PRInt32) PR_Select(
|
|
|
|
if (timeout == PR_INTERVAL_NO_TIMEOUT) {
|
|
tvp = NULL;
|
|
+ start = 0; /* Not needed, but shuts down a warning */
|
|
} else {
|
|
tv.tv_sec = (PRInt32)PR_IntervalToSeconds(timeout);
|
|
tv.tv_usec = (PRInt32)PR_IntervalToMicroseconds(
|
|
--- pr/src/pthreads/ptsynch.c.orig 2015-10-16 13:22:19 UTC
|
|
+++ pr/src/pthreads/ptsynch.c
|
|
@@ -30,7 +30,7 @@ static pthread_t pt_zero_tid; /* a null
|
|
#endif /* defined(_PR_DCETHREADS) */
|
|
#endif /* defined(DEBUG) */
|
|
|
|
-#if defined(FREEBSD)
|
|
+#if defined(FREEBSD) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
|
|
/*
|
|
* On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
|
|
* Newer versions return EBUSY. We still need to support both.
|