From bd23adba12c00d7e2a9f4f841daf3d03c38cdb2c Mon Sep 17 00:00:00 2001
From: Charles Briere <charlesbriere.flatzo@gmail.com>
Date: Wed, 27 Nov 2013 07:48:32 -0800
Subject: [PATCH] Android: do not redefine gettid on Android

Bionic already defines gettid through <unistd.h>.

Signed-off-by: Charles Briere <charlesbriere.flatzo@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---
 tests/common/thread-id.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/common/thread-id.h b/tests/common/thread-id.h
index 47a7457..7261333 100644
--- a/tests/common/thread-id.h
+++ b/tests/common/thread-id.h
@@ -42,6 +42,11 @@ 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>.
+ */
 #else
 # warning "use pid as thread ID"
 static inline
-- 
2.34.1