From ca1938db6aed3e620314e9dfc451d7fe4d4ebb91 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 4 Apr 2010 20:15:21 +0200 Subject: [PATCH] math: Fix some C++ test errors on Solaris 8. --- ChangeLog | 5 +++++ lib/math.in.h | 18 ++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 995ac877a..b6bec677e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-04-04 Bruno Haible + math: Fix some C++ test errors on Solaris 8. + * lib/math.in.h (truncf, trunc): Use simpler idiom. + +2010-04-04 Bruno Haible + math: Fix some C++ test errors on Cygwin. * lib/math.in.h (ceilf, ceill, floorf, floorl, roundf, round, roundl, truncl): Provide declaration if the system does not have it. diff --git a/lib/math.in.h b/lib/math.in.h index f0d50215f..001d59a1d 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -520,14 +520,9 @@ _GL_WARN_ON_USE (tanl, "tanl is unportable - " #if @GNULIB_TRUNCF@ # if !@HAVE_DECL_TRUNCF@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define truncf rpl_truncf -# endif -_GL_FUNCDECL_RPL (truncf, float, (float x)); -_GL_CXXALIAS_RPL (truncf, float, (float x)); -# else -_GL_CXXALIAS_SYS (truncf, float, (float x)); +_GL_FUNCDECL_SYS (truncf, float, (float x)); # endif +_GL_CXXALIAS_SYS (truncf, float, (float x)); _GL_CXXALIASWARN (truncf); #elif defined GNULIB_POSIXCHECK # undef truncf @@ -539,14 +534,9 @@ _GL_WARN_ON_USE (truncf, "truncf is unportable - " #if @GNULIB_TRUNC@ # if !@HAVE_DECL_TRUNC@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define trunc rpl_trunc -# endif -_GL_FUNCDECL_RPL (trunc, double, (double x)); -_GL_CXXALIAS_RPL (trunc, double, (double x)); -# else -_GL_CXXALIAS_SYS (trunc, double, (double x)); +_GL_FUNCDECL_SYS (trunc, double, (double x)); # endif +_GL_CXXALIAS_SYS (trunc, double, (double x)); _GL_CXXALIASWARN (trunc); #elif defined GNULIB_POSIXCHECK # undef trunc -- 2.11.0