head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.0.22
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.20
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.18
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.16
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.14
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.12
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.10
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.8
	pkgsrc-2008Q1:1.1.0.6
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.4
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.2
	pkgsrc-2007Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.11.10.16.44.06;	author tnn;	state dead;
branches;
next	1.1;

1.1
date	2007.09.25.04.18.26;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- update to nspr-4.8.2.5
- take maintainership
- let this package automatically track the stable gecko branch
- clean out some legacy patches

This is the first part of PR pkg/42277.
@
text
@$NetBSD: patch-ah,v 1.1 2007/09/25 04:18:26 bjs Exp $

Does this package really ever need priority scheduling?  #undef it.
If _DONT_CAST_PTHREAD_T is defined, then do as the macro says.  After
all, it could be 64-bit.  From FreeBSD ports.

--- pr/src/pthreads/ptthread.c.orig	2006-11-30 19:34:12.000000000 -0500
+++ pr/src/pthreads/ptthread.c
@@@@ -52,6 +52,10 @@@@
 #include <string.h>
 #include <signal.h>
 
+/* XXX should nspr ever really need to set priority? */
+
+#undef _POSIX_THREAD_PRIORITY_SCHEDULING 
+
 /*
  * Record whether or not we have the privilege to set the scheduling
  * policy and priority of threads.  0 means that privilege is available.
@@@@ -979,12 +983,20 @@@@ PR_IMPLEMENT(void) PR_ProcessExit(PRIntn
     _exit(status);
 }
 
+#ifndef _DONT_CAST_PTHREAD_T
 PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
+#else
+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
+#endif /* _DONT_CAST_PTHREAD_T */
 {
 #if defined(_PR_DCETHREADS)
     return (PRUint32)&thred->id;  /* this is really a sham! */
 #else
+#ifndef _DONT_CAST_PTHREAD_T
     return (PRUint32)thred->id;  /* and I don't know what they will do with it */
+#else
+    return thred->id;  /* and I don't know what they will do with it */
+#endif /* _DONT_CAST_PTHREAD_T */
 #endif
 }
 
@@@@ -1116,7 +1128,13 @@@@ PR_IMPLEMENT(PRStatus) PR_EnumerateThrea
     PRIntn count = 0;
     PRStatus rv = PR_SUCCESS;
     PRThread* thred = pt_book.first;
+#ifdef _DONT_CAST_PTHREAD_T
+#if !defined(_PR_DCETHREADS) && (defined(DEBUG) || defined(FORCE_PR_ASSERT))
+#endif /* _DONT_CAST_PTHREAD_T */
     PRThread *me = PR_CurrentThread();
+#ifdef _DONT_CAST_PTHREAD_T
+#endif
+#endif /* _DONT_CAST_PTHREAD_T */
 
     PR_LOG(_pr_gc_lm, PR_LOG_ALWAYS, ("Begin PR_EnumerateThreads\n"));
     /*
@


1.1
log
@
Update to version 4.6.7 (bugfix release).  See new patches
for more information about them.  While here, fix pkglint warnings.

ok'd by joerg@@
@
text
@d1 1
a1 1
$NetBSD$
@