From: Bruno Haible <bruno@clisp.org>
Date: Sun, 4 Apr 2010 18:15:21 +0000 (+0200)
Subject: math: Fix some C++ test errors on Solaris 8.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca1938db6aed3e620314e9dfc451d7fe4d4ebb91;p=pspp

math: Fix some C++ test errors on Solaris 8.
---

diff --git a/ChangeLog b/ChangeLog
index 995ac877a9..b6bec677e1 100644
--- 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.
diff --git a/lib/math.in.h b/lib/math.in.h
index f0d50215fc..001d59a1df 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