diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | math/bits/mathcalls.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 600c3dd501..08a05bfb7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2016-01-11 Jonathan Wakely <jwakely.gcc@gmail.com> + Adhemerval Zanella <adhemerval.zanella@linaro.org> + + [BZ #19439] + * math/bits/mathcalls.h + [!__cplusplus || __cplusplus < 201103L] (isinf): Do not declare + prototype. + [!__cplusplus || __cplusplus < 201103L] (isnan): Likewise. + 2016-01-11 Andreas Schwab <schwab@suse.de> [BZ #19253] diff --git a/math/bits/mathcalls.h b/math/bits/mathcalls.h index b82c37352f..a48345d916 100644 --- a/math/bits/mathcalls.h +++ b/math/bits/mathcalls.h @@ -196,9 +196,11 @@ __MATHDECL_1 (int,__finite,, (_Mdouble_ __value)) __attribute__ ((__const__)); _Mdouble_END_NAMESPACE #ifdef __USE_MISC +# if !defined __cplusplus || __cplusplus < 201103L /* Conflicts with C++11. */ /* 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__)); +# endif /* Return nonzero if VALUE is finite and not NaN. */ __MATHDECL_1 (int,finite,, (_Mdouble_ __value)) __attribute__ ((__const__)); @@ -230,8 +232,10 @@ __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. */ /* Return nonzero if VALUE is not a number. */ __MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__)); +# endif #endif #if defined __USE_MISC || (defined __USE_XOPEN && __MATH_DECLARING_DOUBLE) |