From mboxrd@z Thu Jan 1 00:00:00 1970 From: charlesbriere.flatzo@gmail.com (Charles Briere) Date: Tue, 26 Nov 2013 21:08:21 -0800 Subject: [lttng-dev] [PATCH liburcu 4/5] Fix: Do not redefine gettid on Android In-Reply-To: <1385528902-4797-1-git-send-email-charlesbriere.flatzo@gmail.com> References: <1385528902-4797-1-git-send-email-charlesbriere.flatzo@gmail.com> Message-ID: <1385528902-4797-4-git-send-email-charlesbriere.flatzo@gmail.com> Bionic already defines gettid through Signed-off-by: Charles Briere --- tests/common/thread-id.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/common/thread-id.h b/tests/common/thread-id.h index bad3006..a2c9e3a 100644 --- a/tests/common/thread-id.h +++ b/tests/common/thread-id.h @@ -42,6 +42,9 @@ 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 #else # warning "use pid as thread ID" static inline -- 1.8.4.2