diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2009-05-23 17:57:38 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2009-05-23 17:57:38 +0000 |
commit | edf964fb0581620fa2192f585f45c89c143e6dff (patch) | |
tree | 4278ae22e72261d2fb615aa417f3909f6ddffa6a /devel/ptlib26/files | |
parent | d969f4f168717df45873efe9d468f797e2cfea22 (diff) | |
download | ports-edf964fb0581620fa2192f585f45c89c143e6dff.tar.gz ports-edf964fb0581620fa2192f585f45c89c143e6dff.zip |
Notes
Diffstat (limited to 'devel/ptlib26/files')
-rw-r--r-- | devel/ptlib26/files/patch-plugins_vidinput_bsd_h | 22 | ||||
-rw-r--r-- | devel/ptlib26/files/patch-src__ptlib__unix__tlib.cxx | 11 | ||||
-rw-r--r-- | devel/ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx | 47 |
3 files changed, 0 insertions, 80 deletions
diff --git a/devel/ptlib26/files/patch-plugins_vidinput_bsd_h b/devel/ptlib26/files/patch-plugins_vidinput_bsd_h deleted file mode 100644 index 204c610a4b3d..000000000000 --- a/devel/ptlib26/files/patch-plugins_vidinput_bsd_h +++ /dev/null @@ -1,22 +0,0 @@ ---- plugins/vidinput_bsd/vidinput_bsd.h.orig 2009-01-12 06:52:59.000000000 +0800 -+++ plugins/vidinput_bsd/vidinput_bsd.h 2009-02-23 16:33:18.000000000 +0800 -@@ -17,8 +17,10 @@ - #include <sys/param.h> - # if __FreeBSD_version >= 502100 - #include <dev/bktr/ioctl_meteor.h> -+#include <dev/bktr/ioctl_bt848.h> - # else - #include <machine/ioctl_meteor.h> -+#include <machine/ioctl_bt848.h> - # endif - #endif - -@@ -62,7 +64,7 @@ public: - - static PStringList GetInputDeviceNames(); - -- PStringList GetDeviceNames() const -+ PStringArray GetDeviceNames() const - { return GetInputDeviceNames(); } - - PINDEX GetMaxFrameBytes(); diff --git a/devel/ptlib26/files/patch-src__ptlib__unix__tlib.cxx b/devel/ptlib26/files/patch-src__ptlib__unix__tlib.cxx deleted file mode 100644 index c0f11e3062ac..000000000000 --- a/devel/ptlib26/files/patch-src__ptlib__unix__tlib.cxx +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/ptlib/unix/tlib.cxx.orig 2009-02-14 22:02:51.000000000 +0100 -+++ ./src/ptlib/unix/tlib.cxx 2009-02-14 22:03:09.000000000 +0100 -@@ -400,7 +400,7 @@ - { - if (PProcessInstance != NULL) { - PWaitAndSignal m(PProcessInstance->threadMutex); -- PThread & thread = PProcessInstance->activeThreads[(unsigned)id]; -+ PThread & thread = PProcessInstance->activeThreads[(unsigned long)id]; - return thread.GetThreadName(); - } - return psprintf("%08x", id); diff --git a/devel/ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx b/devel/ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx deleted file mode 100644 index 4339d642a33e..000000000000 --- a/devel/ptlib26/files/patch-src__ptlib__unix__tlibthrd.cxx +++ /dev/null @@ -1,47 +0,0 @@ ---- ./src/ptlib/unix/tlibthrd.cxx.orig 2009-02-14 22:04:11.000000000 +0100 -+++ ./src/ptlib/unix/tlibthrd.cxx 2009-02-14 22:04:18.000000000 +0100 -@@ -216,7 +216,7 @@ - { - PWaitAndSignal m(threadMutex); - -- if (!activeThreads.Contains((unsigned)id)) -+ if (!activeThreads.Contains((unsigned long)id)) - return PFalse; - - return pthread_kill(id, sig) == 0; -@@ -254,7 +254,7 @@ - #endif - - ((PProcess *)this)->activeThreads.DisallowDeleteObjects(); -- ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this); -+ ((PProcess *)this)->activeThreads.SetAt((unsigned long)PX_threadId, this); - - PX_firstTimeStart = PFalse; - } -@@ -370,7 +370,7 @@ - PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart, this)); - - // put the thread into the thread list -- process.activeThreads.SetAt((unsigned)PX_threadId, this); -+ process.activeThreads.SetAt((unsigned long)PX_threadId, this); - if (process.activeThreads.GetSize() > highWaterMark) - newHighWaterMark = highWaterMark = process.activeThreads.GetSize(); - -@@ -693,7 +693,7 @@ - { - PProcess & process = PProcess::Current(); - process.threadMutex.Wait(); -- PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self()); -+ PThread * thread = process.activeThreads.GetAt((unsigned long)pthread_self()); - process.threadMutex.Signal(); - return thread; - } -@@ -834,7 +834,7 @@ - } - - // remove this thread from the active thread list -- process.activeThreads.SetAt((unsigned)id, NULL); -+ process.activeThreads.SetAt((unsigned long)id, NULL); - - // delete the thread if required, note this is done this way to avoid - // a race condition, the thread ID cannot be zeroed before the if! |