----- Original Message ----- > From: "Charles Briere" <[email protected]> > To: "mathieu desnoyers" <[email protected]> > Cc: [email protected], "Charles Briere" > <[email protected]> > Sent: Wednesday, November 27, 2013 10:48:32 AM > Subject: [PATCH liburcu 4/5] Fix: Do not redefine gettid on Android > > Bionic already defines gettid through <unistd.h> > > Signed-off-by: Charles Briere <[email protected]> > --- > 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 bad3006..b89a100 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__) > +/*
I removed a whitespace at the end of this line. Thanks, Mathieu > + * Do not redefine gettid() as it is already included > + * in bionic through <unistd.h> > + */ > #else > # warning "use pid as thread ID" > static inline > -- > 1.8.4.2 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
