Attachment #99257 for bug #138309

View | Details | Raw Unified | Return to bug 138309
Collapse All | Expand All

Lines 6-12 Link Here

(-)/home/melifaro/x/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= ptlib	8	PORTNAME= ptlib
9	PORTVERSION= 2.6.1	9	PORTVERSION= 2.6.4
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_GNOME}	11	MASTER_SITES= ${MASTER_SITE_GNOME}
12	MASTER_SITE_SUBDIR= sources/ptlib/2.6	12	MASTER_SITE_SUBDIR= sources/ptlib/2.6

Lines 1-3 Link Here

(-)/home/melifaro/x/distinfo (-3 / +3 lines)
1	MD5 (ptlib-2.6.1.tar.gz) = 7b61aa08f7bc98cdf5bbe7a909f7eed2	1	MD5 (ptlib-2.6.4.tar.gz) = 1fda52b3f3e899ff13481cc40d58f673
2	SHA256 (ptlib-2.6.1.tar.gz) = f90f7296e3c26ca389038d54f7ede1ef33b85f1a0f622e97afeddada6593a1d9	2	SHA256 (ptlib-2.6.4.tar.gz) = 4136dba647faa976decee7201ef310b8a5806c9f191cceffb4955a218bd4ff43
3	SIZE (ptlib-2.6.1.tar.gz) = 4858229	3	SIZE (ptlib-2.6.4.tar.gz) = 4858735




--- include/ptlib/critsec.h.orig	2009-04-25 15:01:31.000000000 +0400
+++ include/ptlib/critsec.h	2009-04-25 15:02:45.000000000 +0400
@@ -249,13 +249,13 @@
 __inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { return EXCHANGE_AND_ADD(&m_value, -1); }
 __inline void PAtomicInteger::SetValue(IntegerType value)                   { m_value = value; }
 #else
-__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&mutex, NULL); }
-__inline PAtomicInteger::~PAtomicInteger()                                  { pthread_mutex_destroy(&mutex); }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++()           { pthread_mutex_lock(&mutex); int retval = ++m_value; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int)        { pthread_mutex_lock(&mutex); int retval = m_value++; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--()           { pthread_mutex_lock(&mutex); int retval = --m_value; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { pthread_mutex_lock(&mutex); int retval = m_value--; pthread_mutex_unlock(&mutex); return retval; }
-__inline void PAtomicInteger::SetValue(IntegerType v)                       { pthread_mutex_lock(&mutex); m_value = v; pthread_mutex_unlock(&mutex); }
+__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&m_mutex, NULL); }
+__inline PAtomicInteger::~PAtomicInteger()                                  { pthread_mutex_destroy(&m_mutex); }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++()           { pthread_mutex_lock(&m_mutex); int retval = ++m_value; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int)        { pthread_mutex_lock(&m_mutex); int retval = m_value++; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--()           { pthread_mutex_lock(&m_mutex); int retval = --m_value; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { pthread_mutex_lock(&m_mutex); int retval = m_value--; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline void PAtomicInteger::SetValue(IntegerType v)                       { pthread_mutex_lock(&m_mutex); m_value = v; pthread_mutex_unlock(&m_mutex); }
 #endif
 
 

Lines 1-11 Link Here

(-)/home/melifaro/x/files/patch-include_ptclib_vsdl.h (-11 lines)
1	--- include/ptclib/vsdl.h.orig 2008-09-25 14:51:15.000000000 +0800
2	+++ include/ptclib/vsdl.h 2008-09-25 14:52:15.000000000 +0800
3	@@ -33,7 +33,7 @@
4
5	#include <ptlib.h>
6	#if defined(P_FREEBSD)
7	-#include <SDL11/SDL.h>
8	+#include <SDL.h>
9	#else
10	#include <SDL/SDL.h>
11	#endif




--- ./src/ptlib/common/osutils.cxx.orig	2009-02-14 22:04:50.000000000 +0100
+++ ./src/ptlib/common/osutils.cxx	2009-02-14 22:04:55.000000000 +0100
@@ -2152,21 +2152,21 @@
 PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
 {
   PWaitAndSignal mutex(nestingMutex);
-  return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
+  return nestedThreads.GetAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
 }
 
 
 void PReadWriteMutex::EndNest()
 {
   nestingMutex.Wait();
-  nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
+  nestedThreads.RemoveAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
   nestingMutex.Signal();
 }
 
 
 PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
 {
-  POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
+  POrdinalKey threadId = (unsigned long)PThread::GetCurrentThreadId();
 
   nestingMutex.Wait();
 




--- ./src/ptlib/unix/svcproc.cxx.orig	2009-02-14 22:03:27.000000000 +0100
+++ ./src/ptlib/unix/svcproc.cxx	2009-02-14 22:03:32.000000000 +0100
@@ -165,7 +165,7 @@
 #elif defined(BE_THREADS)
       thread_id tid = ::find_thread(NULL);
 #else
-      unsigned tid = (unsigned) pthread_self();
+      unsigned long tid = (unsigned long)pthread_self();
 #endif
       *out << "ThreadID=0x"
            << setfill('0') << ::hex
@@ -719,12 +719,12 @@
 #elif defined(BE_THREADS)
   thread_id tid = ::find_thread(NULL);
 #else
-  unsigned tid = (unsigned) pthread_self();
+  unsigned long tid = (unsigned long)pthread_self();
 #endif
   PThread * thread_ptr = activeThreads.GetAt(tid);
 
   char msg[200];
-  sprintf(msg, "\nCaught %s, thread_id=%u", sigmsg, tid);
+  sprintf(msg, "\nCaught %s, thread_id=%lu", sigmsg, tid);
 
   if (thread_ptr != NULL) {
     PString thread_name = thread_ptr->GetThreadName();

Lines 1-11 Link Here

(-)/home/melifaro/x/files/patch-src_ptclib_vsdl.cxx (-11 lines)
1	--- src/ptclib/vsdl.cxx.orig 2008-09-25 14:50:57.000000000 +0800
2	+++ src/ptclib/vsdl.cxx 2008-09-25 14:51:48.000000000 +0800
3	@@ -44,7 +44,7 @@
4	extern "C" {
5
6	#if defined(P_FREEBSD)
7	-#include <SDL11/SDL.h>
8	+#include <SDL.h>
9	#else
10	#include <SDL/SDL.h>
11	#endif




--- include/ptlib/unix/ptlib/contain.h.orig	2009-08-29 14:52:29.000000000 +0400
+++ include/ptlib/unix/ptlib/contain.h	2009-08-29 14:52:33.000000000 +0400
@@ -81,9 +81,11 @@
 #ifdef P_64BIT
 typedef long          INT;

 #endif
 
 // Create "Windows" style definitions.
--- src/ptlib/unix/tlib.cxx.orig	2009-08-29 15:51:42.000000000 +0400
+++ src/ptlib/unix/tlib.cxx	2009-08-29 15:51:45.000000000 +0400
@@ -400,7 +400,7 @@
 {
   if (PProcessInstance != NULL) {
     PWaitAndSignal m(PProcessInstance->activeThreadMutex);
-    PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
+    PThread & thread = PProcessInstance->activeThreads[_hptr(id)];
     return thread.GetThreadName();
   }
   return psprintf("%08x", id);
--- src/ptlib/unix/tlibthrd.cxx.orig	2009-08-29 14:54:22.000000000 +0400
+++ src/ptlib/unix/tlibthrd.cxx	2009-08-29 15:41:14.000000000 +0400
@@ -250,7 +250,7 @@
 {
   PWaitAndSignal m(activeThreadMutex);
 

     return PFalse;
 
   return pthread_kill(id, sig) == 0;
@@ -259,8 +259,8 @@
 void PProcess::PXSetThread(pthread_t id, PThread * thread)
 {
   activeThreadMutex.Wait();

   activeThreadMutex.Signal();
 
   if (currentThread != NULL) 
@@ -393,7 +393,7 @@
     if (id != 0) {
       process.activeThreadMutex.Wait();
       pthread_detach(id);
-      process.activeThreads.SetAt((unsigned)id, NULL);
+      process.activeThreads.SetAt(_hptr(id), NULL);
       process.activeThreadMutex.Signal();
     }
 
--- src/ptlib/common/osutils.cxx.orig	2009-08-29 15:55:29.000000000 +0400
+++ src/ptlib/common/osutils.cxx	2009-08-29 15:55:32.000000000 +0400
@@ -2208,21 +2208,21 @@
 PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
 {
   PWaitAndSignal mutex(nestingMutex);
-  return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
+  return nestedThreads.GetAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
 }
 
   bool deleteThread = thread->autoDelete; // Get flag before releasing lock
 
 void PReadWriteMutex::EndNest()
+++ src/ptlib/common/osutils.cxx	2009-04-25 22:03:35.000000000 +0400
@@ -1548,7 +1551,7 @@
   , m_library(false)
 {
   nestingMutex.Wait();
-  nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
+  nestedThreads.RemoveAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
   nestingMutex.Signal();
 }
 
   PProcessInstance = this;
 
 PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
 {
-  POrdinalKey threadId = (INT)PThread::GetCurrentThreadId();
+  POrdinalKey threadId = _hptr(PThread::GetCurrentThreadId());
 
   nestingMutex.Wait();
-  PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
+  PThread * thread = process.activeThreads.GetAt(_hptr(GetCurrentThreadId()));
   process.activeThreadMutex.Signal();
 
   if (thread == NULL)

Lines 4-11 Link Here

(-)/home/melifaro/x/files/patch-unix_config.cxx (-2 / +2 lines)
4	#define EXTENSION ".ini"	4	#define EXTENSION ".ini"
5	#define ENVIRONMENT_CONFIG_STR "/\~~environment~~\/"	5	#define ENVIRONMENT_CONFIG_STR "/\~~environment~~\/"
6		6
7	-#ifdef P_MACOSX	7	-#if defined(P_MACOSX) \|\| defined(P_SOLARIS)
8	+#if defined(P_MACOSX) \|\| defined(P_FREEBSD)	8	+#if defined(P_MACOSX) \|\| defined(P_SOLARIS) \|\| defined(P_FREEBSD)
9	#define environ (NULL)	9	#define environ (NULL)
10	#endif	10	#endif
11		11




include/ptclib/rfc1155.h
include/ptclib/shttpsvc.h
include/ptclib/snmp.h
include/ptclib/sockagg.h
include/ptclib/socks.h
include/ptclib/telnet.h
include/ptclib/threadpool.h
include/ptclib/url.h
include/ptclib/vsdl.h
include/ptclib/vxml.h

include/ptlib/int64.h
include/ptlib/ipdsock.h
include/ptlib/ipsock.h
include/ptlib/ipxsock.h
include/ptlib/lists.h
include/ptlib/mail.h
include/ptlib/mutex.h

include/ptlib/socket.h
include/ptlib/sockets.h
include/ptlib/sound.h
include/ptlib/spxsock.h
include/ptlib/svcproc.h
include/ptlib/syncpoint.h
include/ptlib/syncthrd.h

lib/libpt.so
lib/libpt.so.2
lib/libpt_s.a
lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so
%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so
libdata/pkgconfig/ptlib.pc
%%DATADIR%%/make/common.mak
%%DATADIR%%/make/lib.mak

%%DATADIR%%/make/unix.mak
@dirrm %%DATADIR%%/make
@dirrm %%DATADIR%%
%%BSDVIDEO%%@dirrm lib/ptlib-2.6.4/devices/videoinput
@dirrm lib/ptlib-2.6.4/devices/sound
@dirrm lib/ptlib-2.6.4/devices
@dirrm lib/ptlib-2.6.4
@dirrm include/ptlib/unix/ptlib
@dirrm include/ptlib/unix
@dirrm include/ptlib

Return to bug 138309

Lines 1-23 Link Here

(-)/home/melifaro/x/files/patch-critsec.h (-23 lines)
1	--- include/ptlib/critsec.h.orig 2009-04-25 15:01:31.000000000 +0400
2	+++ include/ptlib/critsec.h 2009-04-25 15:02:45.000000000 +0400
3	@@ -249,13 +249,13 @@
4	__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { return EXCHANGE_AND_ADD(&m_value, -1); }
5	__inline void PAtomicInteger::SetValue(IntegerType value) { m_value = value; }
6	#else
7	-__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&mutex, NULL); }
8	-__inline PAtomicInteger::~PAtomicInteger() { pthread_mutex_destroy(&mutex); }
9	-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++() { pthread_mutex_lock(&mutex); int retval = ++m_value; pthread_mutex_unlock(&mutex); return retval; }
10	-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int) { pthread_mutex_lock(&mutex); int retval = m_value++; pthread_mutex_unlock(&mutex); return retval; }
11	-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--() { pthread_mutex_lock(&mutex); int retval = --m_value; pthread_mutex_unlock(&mutex); return retval; }
12	-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { pthread_mutex_lock(&mutex); int retval = m_value--; pthread_mutex_unlock(&mutex); return retval; }
13	-__inline void PAtomicInteger::SetValue(IntegerType v) { pthread_mutex_lock(&mutex); m_value = v; pthread_mutex_unlock(&mutex); }
14	+__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&m_mutex, NULL); }
15	+__inline PAtomicInteger::~PAtomicInteger() { pthread_mutex_destroy(&m_mutex); }
16	+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++() { pthread_mutex_lock(&m_mutex); int retval = ++m_value; pthread_mutex_unlock(&m_mutex); return retval; }
17	+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int) { pthread_mutex_lock(&m_mutex); int retval = m_value++; pthread_mutex_unlock(&m_mutex); return retval; }
18	+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--() { pthread_mutex_lock(&m_mutex); int retval = --m_value; pthread_mutex_unlock(&m_mutex); return retval; }
19	+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { pthread_mutex_lock(&m_mutex); int retval = m_value--; pthread_mutex_unlock(&m_mutex); return retval; }
20	+__inline void PAtomicInteger::SetValue(IntegerType v) { pthread_mutex_lock(&m_mutex); m_value = v; pthread_mutex_unlock(&m_mutex); }
21	#endif
22
23

Lines 1-27 Link Here

(-)/home/melifaro/x/files/patch-src__ptlib__common__osutils.cxx (-27 lines)
1	--- ./src/ptlib/common/osutils.cxx.orig 2009-02-14 22:04:50.000000000 +0100
2	+++ ./src/ptlib/common/osutils.cxx 2009-02-14 22:04:55.000000000 +0100
3	@@ -2152,21 +2152,21 @@
4	PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
5	{
6	PWaitAndSignal mutex(nestingMutex);
7	- return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
8	+ return nestedThreads.GetAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
9	}
10
11
12	void PReadWriteMutex::EndNest()
13	{
14	nestingMutex.Wait();
15	- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
16	+ nestedThreads.RemoveAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
17	nestingMutex.Signal();
18	}
19
20
21	PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
22	{
23	- POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
24	+ POrdinalKey threadId = (unsigned long)PThread::GetCurrentThreadId();
25
26	nestingMutex.Wait();
27

Lines 1-26 Link Here

(-)/home/melifaro/x/files/patch-src__ptlib__unix__svcproc.cxx (-26 lines)
1	--- ./src/ptlib/unix/svcproc.cxx.orig 2009-02-14 22:03:27.000000000 +0100
2	+++ ./src/ptlib/unix/svcproc.cxx 2009-02-14 22:03:32.000000000 +0100
3	@@ -165,7 +165,7 @@
4	#elif defined(BE_THREADS)
5	thread_id tid = ::find_thread(NULL);
6	#else
7	- unsigned tid = (unsigned) pthread_self();
8	+ unsigned long tid = (unsigned long)pthread_self();
9	#endif
10	*out << "ThreadID=0x"
11	<< setfill('0') << ::hex
12	@@ -719,12 +719,12 @@
13	#elif defined(BE_THREADS)
14	thread_id tid = ::find_thread(NULL);
15	#else
16	- unsigned tid = (unsigned) pthread_self();
17	+ unsigned long tid = (unsigned long)pthread_self();
18	#endif
19	PThread * thread_ptr = activeThreads.GetAt(tid);
20
21	char msg[200];
22	- sprintf(msg, "\nCaught %s, thread_id=%u", sigmsg, tid);
23	+ sprintf(msg, "\nCaught %s, thread_id=%lu", sigmsg, tid);
24
25	if (thread_ptr != NULL) {
26	PString thread_name = thread_ptr->GetThreadName();

Lines 1-5 Link Here

(-)/home/melifaro/x/files/patch-threads (-32 / +39 lines)
1	--- include/ptlib/unix/ptlib/contain.h.orig 2009-04-25 21:59:44.000000000 +0400	1	--- include/ptlib/unix/ptlib/contain.h.orig 2009-08-29 14:52:29.000000000 +0400
2	+++ include/ptlib/unix/ptlib/contain.h 2009-04-25 22:01:14.000000000 +0400	2	+++ include/ptlib/unix/ptlib/contain.h 2009-08-29 14:52:33.000000000 +0400
3	@@ -81,9 +81,11 @@	3	@@ -81,9 +81,11 @@
4	#ifdef P_64BIT	4	#ifdef P_64BIT
5	typedef long INT;	5	typedef long INT;
Lines 12-31 Link Here
12	#endif	12	#endif
13		13
14	// Create "Windows" style definitions.	14	// Create "Windows" style definitions.
15	--- src/ptlib/unix/tlib.cxx 2009-03-18 06:43:30.000000000 +0300	15	--- src/ptlib/unix/tlib.cxx.orig 2009-08-29 15:51:42.000000000 +0400
16	+++ src/ptlib/unix/tlib.cxx 2009-04-25 22:03:56.000000000 +0400	16	+++ src/ptlib/unix/tlib.cxx 2009-08-29 15:51:45.000000000 +0400
17	@@ -400,7 +404,7 @@	17	@@ -400,7 +400,7 @@
18	{	18	{
19	if (PProcessInstance != NULL) {	19	if (PProcessInstance != NULL) {
20	PWaitAndSignal m(PProcessInstance->activeThreadMutex);	20	PWaitAndSignal m(PProcessInstance->activeThreadMutex);
21	- PThread & thread = PProcessInstance->activeThreads[(unsigned)id];	21	- PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
22	+ PThread & thread = PProcessInstance->activeThreads[_hptr(id)];	22	+ PThread & thread = PProcessInstance->activeThreads[_hptr(id)];
23	return thread.GetThreadName();	23	return thread.GetThreadName();
24	}	24	}
25	return psprintf("%08x", id);	25	return psprintf("%08x", id);
26	--- src/ptlib/unix/tlibthrd.cxx 2009-03-18 06:43:30.000000000 +0300	26	--- src/ptlib/unix/tlibthrd.cxx.orig 2009-08-29 14:54:22.000000000 +0400
27	+++ src/ptlib/unix/tlibthrd.cxx 2009-04-25 22:03:45.000000000 +0400	27	+++ src/ptlib/unix/tlibthrd.cxx 2009-08-29 15:41:14.000000000 +0400
28	@@ -240,7 +240,7 @@	28	@@ -250,7 +250,7 @@
29	{	29	{
30	PWaitAndSignal m(activeThreadMutex);	30	PWaitAndSignal m(activeThreadMutex);
31		31
Lines 34-40 Link Here
34	return PFalse;	34	return PFalse;
35		35
36	return pthread_kill(id, sig) == 0;	36	return pthread_kill(id, sig) == 0;
37	@@ -249,8 +249,8 @@	37	@@ -259,8 +259,8 @@
38	void PProcess::PXSetThread(pthread_t id, PThread * thread)	38	void PProcess::PXSetThread(pthread_t id, PThread * thread)
39	{	39	{
40	activeThreadMutex.Wait();	40	activeThreadMutex.Wait();
Lines 45-76 Link Here
45	activeThreadMutex.Signal();	45	activeThreadMutex.Signal();
46		46
47	if (currentThread != NULL)	47	if (currentThread != NULL)
48	@@ -891,7 +891,7 @@	48	@@ -393,7 +393,7 @@
49	}	49	if (id != 0) {
50		50	process.activeThreadMutex.Wait();
51	// remove this thread from the active thread list	51	pthread_detach(id);
52	- process.activeThreads.SetAt((unsigned)id, NULL);	52	- process.activeThreads.SetAt((unsigned)id, NULL);
53	+ process.activeThreads.SetAt(_hptr(id), NULL);	53	+ process.activeThreads.SetAt(_hptr(id), NULL);
		54	process.activeThreadMutex.Signal();
		55	}
		56
		57	--- src/ptlib/common/osutils.cxx.orig 2009-08-29 15:55:29.000000000 +0400
		58	+++ src/ptlib/common/osutils.cxx 2009-08-29 15:55:32.000000000 +0400
		59	@@ -2208,21 +2208,21 @@
		60	PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
		61	{
		62	PWaitAndSignal mutex(nestingMutex);
		63	- return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
		64	+ return nestedThreads.GetAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
		65	}
54		66
55	bool deleteThread = thread->autoDelete; // Get flag before releasing lock
56		67
57	--- src/ptlib/common/osutils.cxx 2009-03-18 06:43:33.000000000 +0300	68	void PReadWriteMutex::EndNest()
58	+++ src/ptlib/common/osutils.cxx 2009-04-25 22:03:35.000000000 +0400
59	@@ -1548,7 +1551,7 @@
60	, m_library(false)
61	{	69	{
62	activeThreads.DisallowDeleteObjects();	70	nestingMutex.Wait();
63	- activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);	71	- nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
64	+ activeThreads.SetAt(_hptr(GetCurrentThreadId()), this);	72	+ nestedThreads.RemoveAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
		73	nestingMutex.Signal();
		74	}
65		75
66	PProcessInstance = this;
67		76
68	@@ -1912,7 +1915,7 @@	77	PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
69	PProcess & process = PProcess::Current();	78	{
		79	- POrdinalKey threadId = (INT)PThread::GetCurrentThreadId();
		80	+ POrdinalKey threadId = _hptr(PThread::GetCurrentThreadId());
70		81
71	process.activeThreadMutex.Wait();	82	nestingMutex.Wait();
72	- PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
73	+ PThread * thread = process.activeThreads.GetAt(_hptr(GetCurrentThreadId()));
74	process.activeThreadMutex.Signal();
75		83
76	if (thread == NULL)

Lines 47-55 Link Here

(-)/home/melifaro/x/pkg-plist (-9 / +7 lines)
47	include/ptclib/rfc1155.h	47	include/ptclib/rfc1155.h
48	include/ptclib/shttpsvc.h	48	include/ptclib/shttpsvc.h
49	include/ptclib/snmp.h	49	include/ptclib/snmp.h
50	include/ptclib/sockagg.h
51	include/ptclib/socks.h	50	include/ptclib/socks.h
52	include/ptclib/telnet.h	51	include/ptclib/telnet.h
		52	include/ptclib/threadpool.h
53	include/ptclib/url.h	53	include/ptclib/url.h
54	include/ptclib/vsdl.h	54	include/ptclib/vsdl.h
55	include/ptclib/vxml.h	55	include/ptclib/vxml.h
Lines 77-83 Link Here
77	include/ptlib/int64.h	77	include/ptlib/int64.h
78	include/ptlib/ipdsock.h	78	include/ptlib/ipdsock.h
79	include/ptlib/ipsock.h	79	include/ptlib/ipsock.h
80	include/ptlib/ipxsock.h
81	include/ptlib/lists.h	80	include/ptlib/lists.h
82	include/ptlib/mail.h	81	include/ptlib/mail.h
83	include/ptlib/mutex.h	82	include/ptlib/mutex.h
Lines 105-111 Link Here
105	include/ptlib/socket.h	104	include/ptlib/socket.h
106	include/ptlib/sockets.h	105	include/ptlib/sockets.h
107	include/ptlib/sound.h	106	include/ptlib/sound.h
108	include/ptlib/spxsock.h
109	include/ptlib/svcproc.h	107	include/ptlib/svcproc.h
110	include/ptlib/syncpoint.h	108	include/ptlib/syncpoint.h
111	include/ptlib/syncthrd.h	109	include/ptlib/syncthrd.h
Lines 161-168 Link Here
161	lib/libpt.so	159	lib/libpt.so
162	lib/libpt.so.2	160	lib/libpt.so.2
163	lib/libpt_s.a	161	lib/libpt_s.a
164	lib/ptlib-2.6.1/devices/sound/oss_pwplugin.so	162	lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so
165	lib/ptlib-2.6.1/devices/videoinput/bsdvideo_pwplugin.so	163	%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so
166	libdata/pkgconfig/ptlib.pc	164	libdata/pkgconfig/ptlib.pc
167	%%DATADIR%%/make/common.mak	165	%%DATADIR%%/make/common.mak
168	%%DATADIR%%/make/lib.mak	166	%%DATADIR%%/make/lib.mak
Lines 173-182 Link Here
173	%%DATADIR%%/make/unix.mak	171	%%DATADIR%%/make/unix.mak
174	@dirrm %%DATADIR%%/make	172	@dirrm %%DATADIR%%/make
175	@dirrm %%DATADIR%%	173	@dirrm %%DATADIR%%
176	@dirrm lib/ptlib-2.6.1/devices/videoinput	174	%%BSDVIDEO%%@dirrm lib/ptlib-2.6.4/devices/videoinput
177	@dirrm lib/ptlib-2.6.1/devices/sound	175	@dirrm lib/ptlib-2.6.4/devices/sound
178	@dirrm lib/ptlib-2.6.1/devices	176	@dirrm lib/ptlib-2.6.4/devices
179	@dirrm lib/ptlib-2.6.1	177	@dirrm lib/ptlib-2.6.4
180	@dirrm include/ptlib/unix/ptlib	178	@dirrm include/ptlib/unix/ptlib
181	@dirrm include/ptlib/unix	179	@dirrm include/ptlib/unix
182	@dirrm include/ptlib	180	@dirrm include/ptlib