* [PATCH, 4.6, committed] Backport fix for g++ -E -C issue in gthr-posix.h
@ 2012-06-05 22:00 Peter Bergner
0 siblings, 0 replies; only message in thread
From: Peter Bergner @ 2012-06-05 22:00 UTC (permalink / raw)
To: gcc-patches
I committed the following patch to the FSF 4.6 branch which Jakub
approved on IRC.
Peter
Backport from mainline
2011-08-29 Jakub Jelinek <jakub@redhat.com>
* gthr-posix.h (__gthread_active_p): Do not use preprocessor
conditionals and comments inside macro arguments.
Index: gcc/gthr-posix.h
===================================================================
--- gcc/gthr-posix.h (revision 188247)
+++ gcc/gthr-posix.h (working copy)
@@ -239,16 +239,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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-05 21:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-05 22:00 [PATCH, 4.6, committed] Backport fix for g++ -E -C issue in gthr-posix.h Peter Bergner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).