pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/nspr



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 18 21:48:33 UTC 2026

Modified Files:
        pkgsrc/devel/nspr: Makefile PLIST distinfo
        pkgsrc/devel/nspr/patches: patch-ab patch-ba
            patch-nspr_pr_src_pthreads_ptsynch.c
            patch-nspr_pr_src_pthreads_ptthread.c
Removed Files:
        pkgsrc/devel/nspr/patches: patch-nspr_pr_include_md___netbsd.cfg
            patch-nspr_pr_src_pthreads_ptio.c

Log Message:
nspr: update to 4.41.

Remove some merged patches.

Changelogs not found.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/nspr/PLIST
cvs rdiff -u -r1.77 -r1.78 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/nspr/patches/patch-ab
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/nspr/patches/patch-ba \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_include_md___netbsd.cfg
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptio.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nspr/Makefile
diff -u pkgsrc/devel/nspr/Makefile:1.129 pkgsrc/devel/nspr/Makefile:1.130
--- pkgsrc/devel/nspr/Makefile:1.129    Tue May  5 14:00:36 2026
+++ pkgsrc/devel/nspr/Makefile  Wed Nov 18 21:48:32 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2026/05/05 14:00:36 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2026/11/18 21:48:32 wiz Exp $
 
-DISTNAME=      nspr-4.39
+DISTNAME=      nspr-4.41
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${PKGVERSION_NOREV}/src/}
 

Index: pkgsrc/devel/nspr/PLIST
diff -u pkgsrc/devel/nspr/PLIST:1.21 pkgsrc/devel/nspr/PLIST:1.22
--- pkgsrc/devel/nspr/PLIST:1.21        Wed Nov  5 11:32:38 2025
+++ pkgsrc/devel/nspr/PLIST     Wed Nov 18 21:48:32 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2025/11/05 11:32:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2026/11/18 21:48:32 wiz Exp $
 ${PLIST.native}bin/compile-et.pl
 bin/nspr-config
 ${PLIST.native}bin/prerr.properties
@@ -11,6 +11,7 @@ include/nspr/md/_netbsd.cfg
 include/nspr/md/_nto.cfg
 include/nspr/md/_openbsd.cfg
 include/nspr/md/_qnx.cfg
+include/nspr/md/_redox.cfg
 include/nspr/md/_riscos.cfg
 include/nspr/md/_solaris.cfg
 include/nspr/md/_win95.cfg

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.77 pkgsrc/devel/nspr/distinfo:1.78
--- pkgsrc/devel/nspr/distinfo:1.77     Tue May 19 08:48:15 2026
+++ pkgsrc/devel/nspr/distinfo  Wed Nov 18 21:48:32 2026
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.77 2026/05/19 08:48:15 jperkin Exp $
+$NetBSD: distinfo,v 1.78 2026/11/18 21:48:32 wiz Exp $
 
-BLAKE2s (nspr-4.39.tar.gz) = 8a12f678b99c6ccac44194b4ce50a0537dbcf276fc9a15dd0410080e5451ace4
-SHA512 (nspr-4.39.tar.gz) = 201627666814552e3c98f66a0bdb18194670dcbdbc8cf3241079d918891d46aef1b10e9339beb84802d1de4189993340febab27344e97f8de21ceb1f43c77bda
-Size (nspr-4.39.tar.gz) = 1014093 bytes
-SHA1 (patch-ab) = 008f5b84994ad20e3b1a0de1e0f7a028932d03d2
+BLAKE2s (nspr-4.41.tar.gz) = d84870b2b36cd55e772aec0b911f2fc3d48d6c9d34a6396bc2b8bf10a63fde5c
+SHA512 (nspr-4.41.tar.gz) = c4b622b1045e7089a58657fcf6f230f8fdb8e0b8c6f73c7200fac6d1c80bd18d348f09a8df9f3fed7867de77070e783675e865b3b5746b916e749ff8d8b2c86f
+Size (nspr-4.41.tar.gz) = 1012978 bytes
+SHA1 (patch-ab) = 0c5ced4b35ccade3fcac087d2fad4afc1752ebb1
 SHA1 (patch-ac) = 6562282cc3d846a114f53ca53b9287fa64d69052
-SHA1 (patch-ba) = 5fe843946d301405e6a4550d14553cf8506ad269
-SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = a3aba89d02cd61f748862ebb3b76050873ccdd69
-SHA1 (patch-nspr_pr_src_pthreads_ptio.c) = 06f920cea9e28e279af48d083177ed767d41cadf
-SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 2aaa26d4b99978557523a4ead45e944684d1611a
-SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 9a0cdd10ed1aad54a0bfb1d575fa47113b1a521b
+SHA1 (patch-ba) = 9d9875ff74717cc1c9201502a633ae5fa923642b
+SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = f6f201959f38c3d42c5b942a6b05c2812dc43aba
+SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 0f2db43010adba6b403b6f36efa630f7853da542

Index: pkgsrc/devel/nspr/patches/patch-ab
diff -u pkgsrc/devel/nspr/patches/patch-ab:1.10 pkgsrc/devel/nspr/patches/patch-ab:1.11
--- pkgsrc/devel/nspr/patches/patch-ab:1.10     Thu Jul  1 07:23:00 2021
+++ pkgsrc/devel/nspr/patches/patch-ab  Wed Nov 18 21:48:32 2026
@@ -1,29 +1,11 @@
-$NetBSD: patch-ab,v 1.10 2021/07/01 07:23:00 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2026/11/18 21:48:32 wiz Exp $
 
 Improve NetBSD support.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718836
 
 --- nspr/pr/include/md/_netbsd.h.orig  2018-03-05 15:50:28.000000000 +0000
 +++ nspr/pr/include/md/_netbsd.h
-@@ -30,6 +30,8 @@
- #elif defined(__arm32__) || defined(__arm__) || defined(__armel__) \
-     || defined(__armeb__)
- #define _PR_SI_ARCHITECTURE "arm"
-+#elif defined(__aarch64__)
-+#define _PR_SI_ARCHITECTURE "aarch64"
- #endif
- 
- #if defined(__ELF__)
-@@ -47,7 +49,7 @@
- #define HAVE_DLL
- #define USE_DLFCN
- #define _PR_HAVE_SOCKADDR_LEN
--#define _PR_NO_LARGE_FILES
-+#define _PR_HAVE_LARGE_OFF_T
- #define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_POLL_AVAILABLE
- #define _PR_USE_POLL
-@@ -75,6 +77,8 @@
+@@ -75,6 +75,8 @@
  #define JB_SP_INDEX 2
  #elif defined(__mips__)
  #define JB_SP_INDEX 4
@@ -32,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cg
  #elif defined(__alpha__)
  #define JB_SP_INDEX 34
  #elif defined(__arm32__)
-@@ -86,6 +90,8 @@
+@@ -86,6 +88,8 @@
  #else
  #define JB_SP_INDEX _JB_REG_R13
  #endif

Index: pkgsrc/devel/nspr/patches/patch-ba
diff -u pkgsrc/devel/nspr/patches/patch-ba:1.4 pkgsrc/devel/nspr/patches/patch-ba:1.5
--- pkgsrc/devel/nspr/patches/patch-ba:1.4      Tue Oct 22 12:52:02 2024
+++ pkgsrc/devel/nspr/patches/patch-ba  Wed Nov 18 21:48:32 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-ba,v 1.4 2024/10/22 12:52:02 ryoon Exp $
+$NetBSD: patch-ba,v 1.5 2026/11/18 21:48:32 wiz Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
---- nspr/pr/include/private/pprthred.h.orig    2024-10-21 11:31:57.000000000 +0000
+--- nspr/pr/include/private/pprthred.h.orig    2026-11-18 18:00:24.000000000 +0000
 +++ nspr/pr/include/private/pprthred.h
-@@ -12,6 +12,8 @@
+@@ -11,6 +11,8 @@
  */
  #include "nspr.h"
  
@@ -14,12 +14,12 @@ https://bugzilla.mozilla.org/show_bug.cg
  PR_BEGIN_EXTERN_C
  
  /*---------------------------------------------------------------------------
-@@ -52,7 +54,7 @@ NSPR_API(void) PR_DetachThread(void);
+@@ -52,7 +54,7 @@ PR_DetachThread(void);
  ** Get the id of the named thread. Each thread is assigned a unique id
  ** when it is created or attached.
  */
--NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
-+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
+-NSPR_API(PRUint32)
++NSPR_API(pthread_t)
+ PR_GetThreadID(PRThread* thread);
  
  /*
- ** Set the procedure that is called when a thread is dumped. The procedure
Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.4 pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.5
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c:1.4 Tue Oct 22 12:52:02 2024
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c     Wed Nov 18 21:48:32 2026
@@ -1,18 +1,16 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.4 2024/10/22 12:52:02 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.5 2026/11/18 21:48:32 wiz Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
---- nspr/pr/src/pthreads/ptthread.c.orig       2024-10-21 11:31:57.000000000 +0000
+--- nspr/pr/src/pthreads/ptthread.c.orig       2026-11-18 21:43:17.682161391 +0000
 +++ nspr/pr/src/pthreads/ptthread.c
-@@ -1088,8 +1088,8 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void) 
+@@ -1106,7 +1106,7 @@ PR_ProcessExit(PRIntn status) { _exit(status); }
+ PR_IMPLEMENT(void)
+ PR_ProcessExit(PRIntn status) { _exit(status); }
  
- PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status) { _exit(status); }
- 
--PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread* thred) {
--  return (PRUint32)thred->id; /* and I don't know what they will do with it */
-+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread* thred) {
-+  return (pthread_t)thred->id; /* and I don't know what they will do with it */
- }
- 
- /*
+-PR_IMPLEMENT(PRUint32)
++PR_IMPLEMENT(pthread_t)
+ PR_GetThreadID(PRThread* thred)
+ {
+     return (PRUint32)thred->id; /* and I don't know what they will do with it */

Index: pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c
diff -u pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.3 pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.4
--- pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c:1.3  Tue Oct 22 12:52:02 2024
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c      Wed Nov 18 21:48:32 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.3 2024/10/22 12:52:02 ryoon Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.4 2026/11/18 21:48:32 wiz Exp $
 
 * Do not use pthread_equal() for non-valid thread pointers.
   From kamin@ on source-changes-d%NetBSD.org@localhost.
@@ -6,105 +6,105 @@ $NetBSD: patch-nspr_pr_src_pthreads_ptsy
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718838
 
---- nspr/pr/src/pthreads/ptsynch.c.orig        2024-10-21 11:31:57.000000000 +0000
+--- nspr/pr/src/pthreads/ptsynch.c.orig        2026-11-18 18:00:24.000000000 +0000
 +++ nspr/pr/src/pthreads/ptsynch.c
-@@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
+@@ -24,6 +24,13 @@ extern PTDebug pt_debug; /* this is shared between sev
  extern PTDebug pt_debug; /* this is shared between several modules */
- #  endif                 /* defined(DEBUG) */
+ #endif                   /* defined(DEBUG) */
  
-+/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++/* pthread_equal() is misused to compare non-valid thread pointers */
 +static int
 +pt_pthread_equal(pthread_t t1, pthread_t t2)
 +{
 +      return t1 == t2;
 +}
 +
- #  if defined(FREEBSD)
+ #if defined(FREEBSD)
  /*
   * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
-@@ -181,9 +188,9 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock*
-   PR_ASSERT(lock != NULL);
-   PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
-   PR_ASSERT(PR_TRUE == lock->locked);
--  PR_ASSERT(pthread_equal(lock->owner, self));
-+  PR_ASSERT(pt_pthread_equal(lock->owner, self));
- 
--  if (!lock->locked || !pthread_equal(lock->owner, self)) {
-+  if (!lock->locked || !pt_pthread_equal(lock->owner, self)) {
-     return PR_FAILURE;
-   }
- 
-@@ -207,7 +214,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
-    * to the correctness of PR_AssertCurrentThreadOwnsLock(), but
-    * this particular order makes the assertion more likely to
-    * catch errors. */
--  PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
-+  PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
+@@ -194,9 +201,9 @@ PR_Unlock(PRLock* lock)
+     PR_ASSERT(lock != NULL);
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
+     PR_ASSERT(PR_TRUE == lock->locked);
+-    PR_ASSERT(pthread_equal(lock->owner, self));
++    PR_ASSERT(pt_pthread_equal(lock->owner, self));
+ 
+-    if (!lock->locked || !pthread_equal(lock->owner, self)) {
++    if (!lock->locked || !pt_pthread_equal(lock->owner, self)) {
+         return PR_FAILURE;
+     }
+ 
+@@ -222,7 +229,7 @@ PR_AssertCurrentThreadOwnsLock(PRLock* lock)
+      * to the correctness of PR_AssertCurrentThreadOwnsLock(), but
+      * this particular order makes the assertion more likely to
+      * catch errors. */
+-    PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
++    PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
  }
  
  /**************************************************************/
-@@ -260,7 +267,7 @@ static void pt_PostNotifyToCvar(PRCondVa
-   _PT_Notified* notified = &cvar->lock->notified;
+@@ -279,7 +286,7 @@ pt_PostNotifyToCvar(PRCondVar* cvar, PRBool broadcast)
+     _PT_Notified* notified = &cvar->lock->notified;
+ 
+     PR_ASSERT(PR_TRUE == cvar->lock->locked);
+-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+ 
+     while (1) {
+@@ -361,7 +368,7 @@ PR_WaitCondVar(PRCondVar* cvar, PRIntervalTime timeout
+     PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+     PR_ASSERT(PR_TRUE == cvar->lock->locked);
+     /* and it better be by us */
+-    PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+ 
+     if (_PT_THREAD_INTERRUPTED(thred)) {
+         goto aborted;
+@@ -576,7 +583,7 @@ PR_GetMonitorEntryCount(PRMonitor* mon)
  
-   PR_ASSERT(PR_TRUE == cvar->lock->locked);
--  PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
-+  PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
-   PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
- 
-   while (1) {
-@@ -336,7 +343,7 @@ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PR
-   PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
-   PR_ASSERT(PR_TRUE == cvar->lock->locked);
-   /* and it better be by us */
--  PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
-+  PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
- 
-   if (_PT_THREAD_INTERRUPTED(thred)) {
-     goto aborted;
-@@ -535,7 +542,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
- 
-   rv = pthread_mutex_lock(&mon->lock);
-   PR_ASSERT(0 == rv);
--  if (pthread_equal(mon->owner, self)) {
-+  if (pt_pthread_equal(mon->owner, self)) {
-     count = mon->entryCount;
-   }
-   rv = pthread_mutex_unlock(&mon->lock);
-@@ -549,7 +556,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
- 
-   rv = pthread_mutex_lock(&mon->lock);
-   PR_ASSERT(0 == rv);
--  PR_ASSERT(mon->entryCount != 0 && pthread_equal(mon->owner, pthread_self()));
-+  PR_ASSERT(mon->entryCount != 0 && pt_pthread_equal(mon->owner, pthread_self()));
-   rv = pthread_mutex_unlock(&mon->lock);
-   PR_ASSERT(0 == rv);
- #  endif
-@@ -563,7 +570,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
-   rv = pthread_mutex_lock(&mon->lock);
-   PR_ASSERT(0 == rv);
-   if (mon->entryCount != 0) {
--    if (pthread_equal(mon->owner, self)) {
-+    if (pt_pthread_equal(mon->owner, self)) {
-       goto done;
+     rv = pthread_mutex_lock(&mon->lock);
+     PR_ASSERT(0 == rv);
+-    if (mon->entryCount != 0 && pthread_equal(mon->owner, self)) {
++    if (mon->entryCount != 0 && pt_pthread_equal(mon->owner, self)) {
+         count = mon->entryCount;
      }
-     while (mon->entryCount != 0) {
-@@ -593,8 +600,8 @@ PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PR
-   PR_ASSERT(0 == rv);
-   /* the entries should be > 0 and we'd better be the owner */
-   PR_ASSERT(mon->entryCount > 0);
--  PR_ASSERT(pthread_equal(mon->owner, self));
--  if (mon->entryCount == 0 || !pthread_equal(mon->owner, self)) {
-+  PR_ASSERT(pt_pthread_equal(mon->owner, self));
-+  if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self)) {
      rv = pthread_mutex_unlock(&mon->lock);
+@@ -592,7 +599,7 @@ PR_AssertCurrentThreadInMonitor(PRMonitor* mon)
+ 
+     rv = pthread_mutex_lock(&mon->lock);
+     PR_ASSERT(0 == rv);
+-    PR_ASSERT(mon->entryCount != 0 && pthread_equal(mon->owner, pthread_self()));
++    PR_ASSERT(mon->entryCount != 0 && pt_pthread_equal(mon->owner, pthread_self()));
+     rv = pthread_mutex_unlock(&mon->lock);
+     PR_ASSERT(0 == rv);
+ #endif
+@@ -608,7 +615,7 @@ PR_EnterMonitor(PRMonitor* mon)
+     rv = pthread_mutex_lock(&mon->lock);
+     PR_ASSERT(0 == rv);
+     if (mon->entryCount != 0) {
+-        if (pthread_equal(mon->owner, self)) {
++        if (pt_pthread_equal(mon->owner, self)) {
+             goto done;
+         }
+         while (mon->entryCount != 0) {
+@@ -640,8 +647,8 @@ PR_ExitMonitor(PRMonitor* mon)
      PR_ASSERT(0 == rv);
-     return PR_FAILURE;
-@@ -638,7 +645,7 @@ PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor
-   /* the entries better be positive */
-   PR_ASSERT(mon->entryCount > 0);
-   /* and it better be owned by us */
--  PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
-+  PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
+     /* the entries should be > 0 and we'd better be the owner */
+     PR_ASSERT(mon->entryCount > 0);
+-    PR_ASSERT(pthread_equal(mon->owner, self));
+-    if (mon->entryCount == 0 || !pthread_equal(mon->owner, self)) {
++    PR_ASSERT(pt_pthread_equal(mon->owner, self));
++    if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self)) {
+         rv = pthread_mutex_unlock(&mon->lock);
+         PR_ASSERT(0 == rv);
+         return PR_FAILURE;
+@@ -687,7 +694,7 @@ PR_Wait(PRMonitor* mon, PRIntervalTime timeout)
+     /* the entries better be positive */
+     PR_ASSERT(mon->entryCount > 0);
+     /* and it better be owned by us */
+-    PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
++    PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
  
-   /* tuck these away 'till later */
-   saved_entries = mon->entryCount;
+     /* tuck these away 'till later */
+     saved_entries = mon->entryCount;



Home | Main Index | Thread Index | Old Index