33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
|
commit 48746aa5a013aab5ca89ee8c29761baec8850c0f
|
||
|
|
Author: Jakub Jelinek <jakub@redhat.com>
|
||
|
|
Date: Mon Feb 1 16:17:55 2016 +0000
|
||
|
|
|
||
|
|
Restore isinf, isinfl, isnanf and isnanl for C++11
|
||
|
|
|
||
|
|
diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h
|
||
|
|
index a48345d..9a7b3f0 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
|