about summary refs log tree commit diff
path: root/math/bits
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2016-02-14 19:27:06 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2016-02-14 20:09:52 -0500
commit3c47c83a9730c20e602694505b9278c25637b0d0 (patch)
treec6f859629e8c270ef682459d2d314e7d68ba51f1 /math/bits
parent1233be76694ca81454f61e2ba5a2fb5830840191 (diff)
downloadglibc-3c47c83a9730c20e602694505b9278c25637b0d0.tar.gz
glibc-3c47c83a9730c20e602694505b9278c25637b0d0.tar.xz
glibc-3c47c83a9730c20e602694505b9278c25637b0d0.zip
Ensure isinff, isinfl, isnanf, and isnanl are defined (Bug 19439)
In ICO C++11 mode ensure that isinff, isinfl, isnanf, and isnanl
are defined.  These functions were accidentally removed from the
header as part of commit d9b965fa56350d6eea9f7f438a0714c7ffbb183f,
but being GNU extensions, they should have been left in place.
Diffstat (limited to 'math/bits')
-rw-r--r--math/bits/mathcalls.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
index a48345d916..9a7b3f0f18 100644
--- a/math/bits/mathcalls.h
+++ b/math/bits/mathcalls.h
@@ -196,7 +196,9 @@ __MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__));
 _Mdouble_END_NAMESPACE
 
 #ifdef __USE_MISC
-# if !defined __cplusplus || __cplusplus < 201103L /* Conflicts with C++11.  */
+# if (!defined __cplusplus \
+      || __cplusplus < 201103L /* isinf conflicts with C++11.  */ \
+      || __MATH_DECLARING_DOUBLE == 0) /* isinff or isinfl don't.  */
 /* Return 0 if VALUE is finite or NaN, +1 if it
    is +Infinity, -1 if it is -Infinity.  */
 __MATHDECL_1 (int,isinf,, (_Mdouble_ __value)) __attribute__ ((__const__));
@@ -232,7 +234,9 @@ __END_NAMESPACE_C99
 __MATHDECL_1 (int,__isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
 
 #if defined __USE_MISC || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
-# if !defined __cplusplus || __cplusplus < 201103L /* Conflicts with C++11.  */
+# if (!defined __cplusplus \
+      || __cplusplus < 201103L /* isnan conflicts with C++11.  */ \
+      || __MATH_DECLARING_DOUBLE == 0) /* isnanf or isnanl don't.  */
 /* Return nonzero if VALUE is not a number.  */
 __MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__));
 # endif