Use trunc module from gnulib instead of our home-grown solution.

Patch #6224.

* helpers.c: Don't need our own trunc function implementation
anymore, since we now use the one from gnulib.

* Smake: Add trunc to module list.

* configure.ac: Don't need to check for trunc function any longer.

diff --git a/ChangeLog b/ChangeLog
index 50a29eef7a57718636e9a0317bc154f6609b9504..853b0724c8418efcd04ea0ce5bc55fa1a2b1158c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-12  Ben Pfaff  <blp@gnu.org>
+
+       Use trunc module from gnulib instead of our home-grown solution.
+       Patch #6224.
+
+       * Smake: Add trunc to module list.
+
+       * configure.ac: Don't need to check for trunc function any longer.
+
 2007-10-12  Ben Pfaff  <blp@gnu.org>
 
        Use fseeko module from gnulib instead of our home-grown solution.

diff --git a/Smake b/Smake
index 21e6a22410a6131f0c3944850eed6e075d7e9064..d2dc497ab8067185061c5e7db83adc87de9694e5 100644 (file)
--- a/Smake
+++ b/Smake
@@ -60,6 +60,7 @@ GNULIB_MODULES = \
        strtoul \
        sys_stat \
        tmpfile \
+       trunc \
        unistd \
        unlocked-io \
        vasprintf-posix \

diff --git a/configure.ac b/configure.ac
index d16c6f49b625bc8c70e2a2968a1d6793417899cc..f738c50b49f46d35c3210068ff7f177abd5c1d12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AC_CHECK_SIZEOF(long double)
 
 AC_C_BIGENDIAN
 
-AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round trunc])
+AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexcept fpsetmask popen round])
 
 AC_PROG_LN_S
 

diff --git a/src/language/expressions/ChangeLog b/src/language/expressions/ChangeLog
index a5895b66a9da8d4f2e46678e312856145c6f430b..a59accb6b826cd6bee664b1eb77f3dba0f9d452f 100644 (file)
--- a/src/language/expressions/ChangeLog
+++ b/src/language/expressions/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-12  Ben Pfaff  <blp@gnu.org>
+
+       Patch #6224.
+
+       * helpers.c: Don't need our own trunc function implementation
+       anymore, since we now use the one from gnulib.
+
 2007-07-17  Ben Pfaff  <blp@gnu.org>
 
        Patch #19335.  Reviewed by John Darrington.

diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index a0f0c0fc735f394d5c17f4cc74347f2beb44e939..a28f1a666ef2180ea17730c024dbfe19f4d1980e 100644 (file)
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -131,15 +131,6 @@ enum date_unit
     DATE_SECONDS
   };
 
-#ifndef HAVE_TRUNC
-/* Return X rounded toward zero. */
-static double
-trunc (double x)
-{
-  return x >= 0.0 ? floor (x) : ceil (x);
-}
-#endif /* !HAVE_TRUNC */
-
 /* Stores in *UNIT the unit whose name is NAME.
    Return success. */
 static enum date_unit