ports/devel/nspr/files/patch-bug301986
Florian Smeets 2f4c3550c5 - update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7
- update seamonkey and linux-seamonkey to 2.12
- update nss to 3.13.6
- update bsdipc code (posix_spawn, SysV shared memory)
- rename patches to easily track those not (yet) submitted upstream
- reduce package size, except for www/libxul[1]
- restore default objdir to what it was in 13.0
- fix mail/enigmail after thunderbird build changes
- don't accidentally pick up headers from installed ports[3]
- add support for PREFIX != LOCALBASE to Makefile.webplugins [4]
- document vulnerabilities in vuln.xml
- *miscellaneous cleanups and fixups*

Obtained from:	OpenBSD ports[1]
PR:		ports/159831, ports/160933, ports/170467[3], ports/170236 [4]
Submitted by:	avilla [4]
In collaboration with:	Jan Beich <jbeich@tormail.net> Who did most of the hard
			work.
2012-08-30 14:54:17 +00:00

35 lines
1 KiB
Text

pthread_t can well be a 64-bit value -- on FreeBSD/amd64, for example.
Better to just keep calling it pthread_t isntead of casting to anything.
-mi
--- ../pr/include/private/pprthred.h Sun Apr 25 11:00:56 2004
+++ ../pr/include/private/pprthred.h Tue Jul 12 00:52:42 2005
@@ -44,4 +44,5 @@
*/
#include "nspr.h"
+#include <pthread.h>
#if defined(XP_OS2)
@@ -92,5 +92,5 @@
** when it is created or attached.
*/
-NSPR_API(PRUint32) PR_GetThreadID(PRThread *thread);
+NSPR_API(pthread_t) PR_GetThreadID(PRThread *thread);
/*
--- ../pr/src/pthreads/ptthread.c Wed May 25 22:27:51 2005
+++ ../pr/src/pthreads/ptthread.c Tue Jul 12 00:49:50 2005
@@ -979,10 +979,10 @@
}
-PR_IMPLEMENT(PRUint32) PR_GetThreadID(PRThread *thred)
+PR_IMPLEMENT(pthread_t) PR_GetThreadID(PRThread *thred)
{
#if defined(_PR_DCETHREADS)
return (PRUint32)&thred->id; /* this is really a sham! */
#else
- return (PRUint32)thred->id; /* and I don't know what they will do with it */
+ return thred->id; /* and I don't know what they will do with it */
#endif
}