changeset 13143:cdede380a9a1

math: Fix some C++ test errors on Solaris 8.
author Bruno Haible <bruno@clisp.org>
date Sun, 04 Apr 2010 20:15:21 +0200
parents 6b79b839590c
children ded40bf5dced
files ChangeLog lib/math.in.h
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-04  Bruno Haible  <bruno@clisp.org>
+
+	math: Fix some C++ test errors on Solaris 8.
+	* lib/math.in.h (truncf, trunc): Use simpler idiom.
+
 2010-04-04  Bruno Haible  <bruno@clisp.org>
 
 	math: Fix some C++ test errors on Cygwin.
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -520,14 +520,9 @@
 
 #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_FUNCDECL_SYS (truncf, float, (float x));
+# endif
 _GL_CXXALIAS_SYS (truncf, float, (float x));
-# endif
 _GL_CXXALIASWARN (truncf);
 #elif defined GNULIB_POSIXCHECK
 # undef truncf
@@ -539,14 +534,9 @@
 
 #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_FUNCDECL_SYS (trunc, double, (double x));
+# endif
 _GL_CXXALIAS_SYS (trunc, double, (double x));
-# endif
 _GL_CXXALIASWARN (trunc);
 #elif defined GNULIB_POSIXCHECK
 # undef trunc