CVS commit: pkgsrc/devel/nspr

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/nspr
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Tue, 22 Oct 2024 12:52:02 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct 22 12:52:02 UTC 2024

Modified Files:
        pkgsrc/devel/nspr: Makefile PLIST distinfo
        pkgsrc/devel/nspr/patches: patch-ac patch-ba
            patch-nspr_pr_src_pthreads_ptsynch.c
            patch-nspr_pr_src_pthreads_ptthread.c

Log Message:
devel/nspr: Update to 4.36

Changelog:
NSPR 4.36 contains the following changes:
- remove support for OS/2
- remove support for Unixware, Bsdi, old AIX, old HPUX9 & scoos
- remove support for Windows 16 bit
- renamed the prwin16.h header to prwin.h
- configure was updated from 2.69 to 2.71
- various build, test and automation script fixes
- major parts of the source code were reformatted


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/nspr/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/nspr/PLIST
cvs rdiff -u -r1.70 -r1.71 pkgsrc/devel/nspr/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/nspr/patches/patch-ac
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/nspr/patches/patch-ba \
    pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c
cvs rdiff -u -r1.2 -r1.3 \
    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.123 pkgsrc/devel/nspr/Makefile:1.124
--- pkgsrc/devel/nspr/Makefile:1.123    Tue Jun 27 10:44:01 2023
+++ pkgsrc/devel/nspr/Makefile  Tue Oct 22 12:52:02 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2023/06/27 10:44:01 riastradh Exp $
+# $NetBSD: Makefile,v 1.124 2024/10/22 12:52:02 ryoon Exp $
 
 DISTNAME=      nspr-${NSPR_RELEASE:S/.0$//}
-NSPR_RELEASE=  4.35.0
+NSPR_RELEASE=  4.36.0
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_MOZILLA_ALL:=nspr/releases/v${NSPR_RELEASE:S/.0$//}/src/}
 

Index: pkgsrc/devel/nspr/PLIST
diff -u pkgsrc/devel/nspr/PLIST:1.18 pkgsrc/devel/nspr/PLIST:1.19
--- pkgsrc/devel/nspr/PLIST:1.18        Tue Jun 27 10:44:01 2023
+++ pkgsrc/devel/nspr/PLIST     Tue Oct 22 12:52:02 2024
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2023/06/27 10:44:01 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.19 2024/10/22 12:52:02 ryoon Exp $
 ${PLIST.native}bin/compile-et.pl
 bin/nspr-config
 ${PLIST.native}bin/prerr.properties
 include/nspr/md/_aix32.cfg
 include/nspr/md/_aix64.cfg
-include/nspr/md/_bsdi.cfg
 include/nspr/md/_darwin.cfg
 include/nspr/md/_freebsd.cfg
 include/nspr/md/_hpux32.cfg
@@ -13,13 +12,9 @@ include/nspr/md/_linux.cfg
 include/nspr/md/_netbsd.cfg
 include/nspr/md/_nto.cfg
 include/nspr/md/_openbsd.cfg
-include/nspr/md/_os2.cfg
 include/nspr/md/_qnx.cfg
 include/nspr/md/_riscos.cfg
-include/nspr/md/_scoos.cfg
 include/nspr/md/_solaris.cfg
-include/nspr/md/_unixware.cfg
-include/nspr/md/_unixware7.cfg
 include/nspr/md/_win95.cfg
 include/nspr/md/_winnt.cfg
 include/nspr/nspr.h
@@ -76,7 +71,7 @@ include/nspr/prtpool.h
 include/nspr/prtrace.h
 include/nspr/prtypes.h
 include/nspr/prvrsion.h
-include/nspr/prwin16.h
+include/nspr/prwin.h
 lib/nspr/libnspr4.a
 lib/nspr/libnspr4.so
 lib/nspr/libplc4.a

Index: pkgsrc/devel/nspr/distinfo
diff -u pkgsrc/devel/nspr/distinfo:1.70 pkgsrc/devel/nspr/distinfo:1.71
--- pkgsrc/devel/nspr/distinfo:1.70     Thu Dec 15 23:01:17 2022
+++ pkgsrc/devel/nspr/distinfo  Tue Oct 22 12:52:02 2024
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.70 2022/12/15 23:01:17 adam Exp $
+$NetBSD: distinfo,v 1.71 2024/10/22 12:52:02 ryoon Exp $
 
-BLAKE2s (nspr-4.35.tar.gz) = c6c0e92a5198ff08e84ff1342b0ca2106e77062ca3109704f17d7d9c34084dbe
-SHA512 (nspr-4.35.tar.gz) = 502815833116e25f79ddf71d1526484908aa92fbc55f8a892729cb404a4daafcc0470a89854cd080d2d20299fdb7d9662507c5362c7ae661cbacf308ac56ef7f
-Size (nspr-4.35.tar.gz) = 1096974 bytes
+BLAKE2s (nspr-4.36.tar.gz) = 5d784242a8bb65cd88e52415a9203e7f2b33421422048d92ee594aff09e0c1ee
+SHA512 (nspr-4.36.tar.gz) = 55d21e196508ad29a179639fc8006f44b04dc2c0b5a85895e727f0a4f0ea37aeeceb936e37ac6b271b882a18e9f06d96133a60f19cee6345f8424c1c66e270ee
+Size (nspr-4.36.tar.gz) = 1036274 bytes
 SHA1 (patch-ab) = 008f5b84994ad20e3b1a0de1e0f7a028932d03d2
-SHA1 (patch-ac) = c751b8397744c969e6141f609cb3914db6e699e3
-SHA1 (patch-ba) = 35f7cc7bbe7fa0f72eb7b506094ad1812b754aa5
+SHA1 (patch-ac) = 710fcb021ab009a28d655703ac1bd909da1e896b
+SHA1 (patch-ba) = 5fe843946d301405e6a4550d14553cf8506ad269
 SHA1 (patch-nspr_pr_include_md___netbsd.cfg) = a3aba89d02cd61f748862ebb3b76050873ccdd69
-SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 77fc5653bcfaf39f55f26b301992aaeb2ff2401c
-SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = af881ec2be2b6b37f435751cd1ac7ad4634e5f0f
+SHA1 (patch-nspr_pr_src_pthreads_ptsynch.c) = 2aaa26d4b99978557523a4ead45e944684d1611a
+SHA1 (patch-nspr_pr_src_pthreads_ptthread.c) = 9a0cdd10ed1aad54a0bfb1d575fa47113b1a521b

Index: pkgsrc/devel/nspr/patches/patch-ac
diff -u pkgsrc/devel/nspr/patches/patch-ac:1.15 pkgsrc/devel/nspr/patches/patch-ac:1.16
--- pkgsrc/devel/nspr/patches/patch-ac:1.15     Thu Jul  1 07:23:00 2021
+++ pkgsrc/devel/nspr/patches/patch-ac  Tue Oct 22 12:52:02 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.15 2021/07/01 07:23:00 wiz Exp $
+$NetBSD: patch-ac,v 1.16 2024/10/22 12:52:02 ryoon Exp $
 
 add runpath to Linux caught during check-shlibs-elf
 
---- nspr/configure.in.orig     2021-06-30 21:43:23.000000000 +0000
+--- nspr/configure.in.orig     2024-10-21 11:31:57.000000000 +0000
 +++ nspr/configure.in
 @@ -38,7 +38,7 @@ OBJDIR_NAME=.
  OBJDIR_SUFFIX=OBJ
@@ -13,7 +13,7 @@ add runpath to Linux caught during check
  LIBPLC='-L$(dist_libdir) -lplc$(MOD_MAJOR_VERSION)'
  CYGWIN_WRAPPER=
  MACOS_SDK_DIR=
-@@ -1486,6 +1486,9 @@ tools are selected during the Xcode/Deve
+@@ -1394,6 +1394,9 @@ tools are selected during the Xcode/Deve
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -23,7 +23,7 @@ add runpath to Linux caught during check
      ;;
  
  *-hpux*)
-@@ -1662,6 +1665,9 @@ tools are selected during the Xcode/Deve
+@@ -1563,6 +1566,9 @@ tools are selected during the Xcode/Deve
      MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
      DSO_CFLAGS=-fPIC
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
@@ -33,7 +33,7 @@ add runpath to Linux caught during check
      _OPTIMIZE_FLAGS=-O2
      _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                     # combo is not yet good at debugging inlined
-@@ -1991,7 +1997,7 @@ tools are selected during the Xcode/Deve
+@@ -1892,7 +1898,7 @@ tools are selected during the Xcode/Deve
      AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
      CFLAGS="$CFLAGS -ansi -Wall"
      CXXFLAGS="$CXXFLAGS -ansi -Wall"
@@ -42,11 +42,11 @@ add runpath to Linux caught during check
      DSO_CFLAGS=-fPIC
      MDCPUCFG_H=_openbsd.cfg
      PR_MD_CSRCS=openbsd.c
-@@ -2070,7 +2076,7 @@ tools are selected during the Xcode/Deve
+@@ -1955,7 +1961,7 @@ tools are selected during the Xcode/Deve
          if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
              GCC_USE_GNU_LD=1
          fi
--        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
+-        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore'
 +        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs'
          if test -n "$USE_B_DIRECT"; then
              DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"

Index: pkgsrc/devel/nspr/patches/patch-ba
diff -u pkgsrc/devel/nspr/patches/patch-ba:1.3 pkgsrc/devel/nspr/patches/patch-ba:1.4
--- pkgsrc/devel/nspr/patches/patch-ba:1.3      Thu Jul  1 07:23:00 2021
+++ pkgsrc/devel/nspr/patches/patch-ba  Tue Oct 22 12:52:02 2024
@@ -1,20 +1,20 @@
-$NetBSD: patch-ba,v 1.3 2021/07/01 07:23:00 wiz Exp $
+$NetBSD: patch-ba,v 1.4 2024/10/22 12:52:02 ryoon Exp $
 
 pthread_t may be 64-bit, avoid casting it.
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718835
 
---- nsprpub/pr/include/private/pprthred.h.orig 2009-11-02 22:43:08.000000000 +0100
+--- nspr/pr/include/private/pprthred.h.orig    2024-10-21 11:31:57.000000000 +0000
 +++ nspr/pr/include/private/pprthred.h
-@@ -51,6 +51,8 @@
- #include <os2.h>
- #endif
+@@ -12,6 +12,8 @@
+ */
+ #include "nspr.h"
  
 +#include <pthread.h>
 +
  PR_BEGIN_EXTERN_C
  
  /*---------------------------------------------------------------------------
-@@ -91,7 +93,7 @@ NSPR_API(void) PR_DetachThread(void);
+@@ -52,7 +54,7 @@ NSPR_API(void) PR_DetachThread(void);
  ** Get the id of the named thread. Each thread is assigned a unique id
  ** when it is created or attached.
  */
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.3 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.3 Thu Dec 15 23:01:17 2022
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptthread.c     Tue Oct 22 12:52:02 2024
@@ -1,19 +1,18 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.3 2022/12/15 23:01:17 adam Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptthread.c,v 1.4 2024/10/22 12:52:02 ryoon 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       2022-09-12 11:40:15.000000000 +0000
+--- nspr/pr/src/pthreads/ptthread.c.orig       2024-10-21 11:31:57.000000000 +0000
 +++ nspr/pr/src/pthreads/ptthread.c
-@@ -1183,9 +1183,9 @@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
-     _exit(status);
- }
+@@ -1088,8 +1088,8 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup(void) 
+ 
+ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn status) { _exit(status); }
  
--PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
-+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
- {
--    return (PRUint32)thred->id;  /* and I don't know what they will do with it */
-+    return (pthread_t)thred->id;  /* and I don't know what they will do with it */
+-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 */
  }
  
  /*

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.2 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.2  Thu Jul  1 07:23:00 2021
+++ pkgsrc/devel/nspr/patches/patch-nspr_pr_src_pthreads_ptsynch.c      Tue Oct 22 12:52:02 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.2 2021/07/01 07:23:00 wiz Exp $
+$NetBSD: patch-nspr_pr_src_pthreads_ptsynch.c,v 1.3 2024/10/22 12:52:02 ryoon Exp $
 
 * Do not use pthread_equal() for non-valid thread pointers.
   From kamin@ on source-changes-d%NetBSD.org@localhost.
@@ -6,11 +6,11 @@ $NetBSD: patch-nspr_pr_src_pthreads_ptsy
 
 https://bugzilla.mozilla.org/show_bug.cgi?id=1718838
 
---- nspr/pr/src/pthreads/ptsynch.c.orig        2020-01-31 20:37:50.000000000 +0000
+--- nspr/pr/src/pthreads/ptsynch.c.orig        2024-10-21 11:31:57.000000000 +0000
 +++ nspr/pr/src/pthreads/ptsynch.c
 @@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
- extern PTDebug pt_debug;  /* this is shared between several modules */
- #endif  /* defined(DEBUG) */
+ extern PTDebug pt_debug; /* this is shared between several modules */
+ #  endif                 /* defined(DEBUG) */
  
 +/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
 +static int
@@ -19,92 +19,92 @@ https://bugzilla.mozilla.org/show_bug.cg
 +      return t1 == t2;
 +}
 +
- #if defined(FREEBSD)
+ #  if defined(FREEBSD)
  /*
   * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
-@@ -197,9 +204,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;
-     }
- 
-@@ -225,7 +232,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()));
+@@ -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()));
  }
  
  /**************************************************************/
-@@ -281,7 +288,7 @@ static void pt_PostNotifyToCvar(PRCondVa
-     _PT_Notified *notified = &cvar->lock->notified;
+@@ -260,7 +267,7 @@ static void pt_PostNotifyToCvar(PRCondVa
+   _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)
-@@ -369,7 +376,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;
-@@ -582,7 +589,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
- 
-     rv = pthread_mutex_lock(&mon->lock);
-     PR_ASSERT(0 == rv);
+   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)) {
-         count = mon->entryCount;
+       goto done;
      }
+     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);
-@@ -598,7 +605,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()));
-+              pt_pthread_equal(mon->owner, pthread_self()));
-     rv = pthread_mutex_unlock(&mon->lock);
-     PR_ASSERT(0 == rv);
- #endif
-@@ -614,7 +621,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
-     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)
-@@ -646,8 +653,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);
-         PR_ASSERT(0 == rv);
-@@ -695,7 +702,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()));
+     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()));
  
-     /* tuck these away 'till later */
-     saved_entries = mon->entryCount;
+   /* tuck these away 'till later */
+   saved_entries = mon->entryCount;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index