Cleanup: Re-organise source dir

[urcu.git] / tests / common / thread-id.h

diff --git a/tests/common/thread-id.h b/tests/common/thread-id.h
index 9378edcf2ce9246f12f0260eaf294ad2de1ceaf2..96f1f59ad9ee0d3a7983d5055f8380edfe4a922b 100644 (file)
--- a/tests/common/thread-id.h
+++ b/tests/common/thread-id.h
@@ -19,9 +19,15 @@
  */
 
 #ifdef __linux__
-# include <syscall.h>
+# include <urcu/syscall-compat.h>
 
-# if defined(_syscall0)
+# if defined(HAVE_GETTID)
+/*
+ * Do not redefine gettid() as it is already included
+ * in bionic through <unistd.h>. Some other libc
+ * may also already contain an implementation of gettid.
+ */
+# elif defined(_syscall0)
 _syscall0(pid_t, gettid)
 # elif defined(__NR_gettid)
 static inline pid_t gettid(void)
@@ -43,6 +49,14 @@ unsigned long urcu_get_thread_id(void)
 {
        return (unsigned long) pthread_getthreadid_np();
 }
+#elif defined(__sun__) || defined(__APPLE__)
+#include <pthread.h>
+
+static inline
+unsigned long urcu_get_thread_id(void)
+{
+       return (unsigned long) pthread_self();
+}
 #else
 # warning "use pid as thread ID"
 static inline