diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c1b6de3fc95..27718275163 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 b1d499dcc3d..46054f6a7c2 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;
 }