Merge changes between r7165 and r7310 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@7311 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 8 insertions, 1 deletions

diff --git a/libc/math/tgmath.h b/libc/math/tgmath.h
index 4f45aaa0f..eefdd26c9 100644
--- a/libc/math/tgmath.h
+++ b/libc/math/tgmath.h
@@ -48,7 +48,14 @@
 
 /* 1 if 'type' is a floating type, 0 if 'type' is an integer type.
    Allows for _Bool.  Expands to an integer constant expression.  */
-# define __floating_type(type) (((type) 0.25) && ((type) 0.25 - 1))
+# if __GNUC_PREREQ (3, 1)
+#  define __floating_type(type) \
+  (__builtin_classify_type ((type) 0) == 8 \
+   || (__builtin_classify_type ((type) 0) == 9 \
+       && __builtin_classify_type (__real__ ((type) 0)) == 8))
+# else
+#  define __floating_type(type) (((type) 0.25) && ((type) 0.25 - 1))
+# endif
 
 /* The tgmath real type for T, where E is 0 if T is an integer type and
    1 for a floating type.  */