From 8eb1529674c157efe5ed902d361c8c779116d4a1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 9 Feb 2023 19:27:37 +0100 Subject: [PATCH] math: Fix compilation error in C++ mode on macOS 12.5. * lib/math.in.h (isnan): On macOS, treat clang version 14 again like clang versions < 12. --- ChangeLog | 6 ++++++ lib/math.in.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5b4e71ad3d..867107bb14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-02-09 Bruno Haible + + math: Fix compilation error in C++ mode on macOS 12.5. + * lib/math.in.h (isnan): On macOS, treat clang version 14 again like + clang versions < 12. + 2023-02-09 Bruno Haible Fix compilation errors in C++ mode on macOS 12.5. diff --git a/lib/math.in.h b/lib/math.in.h index 70b75e2399..76d48a4443 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -2624,7 +2624,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__ && __clang_major__ < 12) || (defined __FreeBSD__ && (__clang_major__ < 7 || __clang_major__ >= 11)) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__))) +# if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__ && __clang_major__ != 12) || (defined __FreeBSD__ && (__clang_major__ < 7 || __clang_major__ >= 11)) || 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