summaryrefslogtreecommitdiff
path: root/libs/pbd/pbd/pthread_utils.h
diff options
context:
space:
mode:
authorJohn Emmas <johne53@tiscali.co.uk>2014-09-09 12:03:52 +0100
committerJohn Emmas <johne53@tiscali.co.uk>2014-09-09 12:03:52 +0100
commit61e0705a949dee7e2fff753bbb5cbd78ef54febe (patch)
tree82538d7f2b9bd6a0becdbea7d7c1f281c1f72d42 /libs/pbd/pbd/pthread_utils.h
parent83b6825bd0e4a27a956d6d57ebcab73aa461de00 (diff)
Re-introduce our pthread macros (after fixing an earlier typo)
these are so we can differentiate between 'libpthread' and 'libpthread-win32' (whose implementation is subtlely - though annoyingly! - different)
Diffstat (limited to 'libs/pbd/pbd/pthread_utils.h')
-rw-r--r--libs/pbd/pbd/pthread_utils.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h
index 37ce723715..007a97c9dc 100644
--- a/libs/pbd/pbd/pthread_utils.h
+++ b/libs/pbd/pbd/pthread_utils.h
@@ -20,6 +20,21 @@
#ifndef __pbd_pthread_utils__
#define __pbd_pthread_utils__
+/* Accommodate thread setting (and testing) for both
+ * 'libpthread' and 'libpthread_win32' (whose implementations
+ * of 'pthread_t' are subtlely different)
+ */
+#ifndef PTHREAD_MACROS_DEFINED
+#define PTHREAD_MACROS_DEFINED
+#ifdef PTW32_VERSION /* pthread_win32 */
+#define mark_pthread_inactive(threadID) threadID.p=0
+#define is_pthread_active(threadID) threadID.p!=0
+#else /* normal pthread */
+#define mark_pthread_inactive(threadID) threadID=0
+#define is_pthread_active(threadID) threadID!=0
+#endif /* PTW32_VERSION */
+#endif /* PTHREAD_MACROS_DEFINED */
+
#ifdef COMPILER_MSVC
#include <ardourext/pthread.h>
#else