From 3714764d104151e6b3658ead1559cec3ee9266a6 Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Thu, 27 May 2010 12:08:51 +0000 Subject: gthr-posix.h (pthread_cancel): Don't declare if compiling against Bionic C library. * gthr-posix.h (pthread_cancel): Don't declare if compiling against Bionic C library. (__gthread_active_p): Check for pthread_create if compiling against Bionic C library. From-SVN: r159919 --- gcc/gthr-posix.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gcc/gthr-posix.h') diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index 61b4dda..a7ce311 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -124,7 +124,9 @@ __gthrw(pthread_join) __gthrw(pthread_equal) __gthrw(pthread_self) __gthrw(pthread_detach) +#ifndef __BIONIC__ __gthrw(pthread_cancel) +#endif __gthrw(sched_yield) __gthrw(pthread_mutex_lock) @@ -238,7 +240,15 @@ static inline int __gthread_active_p (void) { static void *const __gthread_active_ptr - = __extension__ (void *) &__gthrw_(pthread_cancel); + = __extension__ (void *) &__gthrw_( +/* Android's C library does not provide pthread_cancel, check for + `pthread_create' instead. */ +#ifndef __BIONIC__ + pthread_cancel +#else + pthread_create +#endif + ); return __gthread_active_ptr != 0; } -- cgit v1.1