X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fcommon%2Fthread-id.h;h=690fdf009677f714918f738e755c53584e73c305;hp=72613333b2ab0ddb482a6fd486fb6c51a9d0ca9f;hb=09bdef43191a9de4bcc770ad680fa20776a8f683;hpb=bd23adba12c00d7e2a9f4f841daf3d03c38cdb2c

diff --git a/tests/common/thread-id.h b/tests/common/thread-id.h
index 7261333..690fdf0 100644
--- a/tests/common/thread-id.h
+++ b/tests/common/thread-id.h
@@ -17,10 +17,18 @@
  * provided the above notices are retained, and a notice that the code was
  * modified is included with the above copyright notice.
  */
+#include <config.h>
+
 #ifdef __linux__
 # 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)
@@ -42,11 +50,14 @@ unsigned long urcu_get_thread_id(void)
 {
 	return (unsigned long) pthread_getthreadid_np();
 }
-#elif defined(__Android__)
-/*
- * Do not redefine gettid() as it is already included
- * in bionic through <unistd.h>.
- */
+#elif defined(__sun__)
+#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