diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-08-29 23:00:39 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-08-29 23:00:39 +0200 |
| commit | e621f5307a89d2a533c2a644f9f168b1b97afd64 (patch) | |
| tree | 96ab2165f881a2d3b1c3b139f9ff4dcbe0779835 | |
| parent | edf2239b377968f0c5961e5531c989d942781977 (diff) | |
| download | gcc-e621f5307a89d2a533c2a644f9f168b1b97afd64.zip gcc-e621f5307a89d2a533c2a644f9f168b1b97afd64.tar.gz gcc-e621f5307a89d2a533c2a644f9f168b1b97afd64.tar.bz2 | |
gthr-posix.h (__gthread_active_p): Do not use preprocessor conditionals and comments inside macro arguments.
* gthr-posix.h (__gthread_active_p): Do not use preprocessor
conditionals and comments inside macro arguments.
From-SVN: r178258
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/gthr-posix.h | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c1b6de3..2771827 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ +2011-08-29 Jakub Jelinek <jakub@redhat.com> + + * gthr-posix.h (__gthread_active_p): Do not use preprocessor + conditionals and comments inside macro arguments. + 20011-08-29 Artjoms Sinkarovs <artyom.shinkaroff@gmail.com> - Richard Guenther <rguenther@suse.de> + Richard Guenther <rguenther@suse.de> * tree.h (constant_boolean_node): Adjust prototype. * fold-const.c (fold_convert_loc): Move aggregate conversion diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index b1d499d..46054f6 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -244,16 +244,15 @@ __gthread_active_p (void) static inline int __gthread_active_p (void) { - static void *const __gthread_active_ptr - = __extension__ (void *) &__gthrw_( /* Android's C library does not provide pthread_cancel, check for `pthread_create' instead. */ #ifndef __BIONIC__ - pthread_cancel + static void *const __gthread_active_ptr + = __extension__ (void *) &__gthrw_(pthread_cancel); #else - pthread_create + static void *const __gthread_active_ptr + = __extension__ (void *) &__gthrw_(pthread_create); #endif - ); return __gthread_active_ptr != 0; } |