From 24ce26719044afee22e93b8b1d7f3070dbb5690c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 9 Dec 2020 18:08:18 +0100 Subject: [PATCH] math C++ tests: Fix compilation error in with clang >= 7 on FreeBSD. * lib/math.in.h (isnan): For clang >= 7 on FreeBSD, declare 'rpl_isnan', not 'isnan'. --- ChangeLog | 6 ++++++ lib/math.in.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 59b4b72acd..817bd1f9ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-12-09 Bruno Haible + + math C++ tests: Fix compilation error in with clang >= 7 on FreeBSD. + * lib/math.in.h (isnan): For clang >= 7 on FreeBSD, declare 'rpl_isnan', + not 'isnan'. + 2020-12-08 Bruno Haible std-gnu11: Make compatible with Autoconf 2.70. diff --git a/lib/math.in.h b/lib/math.in.h index 4090eff35e..ebf2e0dd41 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -2566,7 +2566,7 @@ _GL_EXTERN_C int rpl_isnanl (long double x) _GL_ATTRIBUTE_CONST; # if defined isnan || defined GNULIB_NAMESPACE _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isnan) # undef isnan -# if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__))) +# if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || (defined __FreeBSD__ && __clang_major__ < 7) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__))) /* This platform's possibly defines isnan through a set of inline functions. */ _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, rpl_isnan, bool) -- 2.39.5