[Pspp-cvs] pspp ChangeLog Smake src/data/ChangeLog src/dat...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/11/03 02:32:38

Modified files:
        .              : ChangeLog Smake 
        src/data       : ChangeLog data-out.c 

Log message:
        Use isfinite, round modules from gnulib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/data-out.c?cvsroot=pspp&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- ChangeLog   13 Oct 2007 04:57:48 -0000      1.91
+++ ChangeLog   3 Nov 2007 02:32:37 -0000       1.92
@@ -1,3 +1,7 @@
+2007-11-02  Ben Pfaff  <address@hidden>
+
+       * Smake (GNULIB_MODULES): Add isfinite, round modules.
+
 2007-10-12  Ben Pfaff  <address@hidden>
 
        Use trunc module from gnulib instead of our home-grown solution.

Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Smake       13 Oct 2007 04:57:48 -0000      1.63
+++ Smake       3 Nov 2007 02:32:37 -0000       1.64
@@ -24,6 +24,7 @@
        getopt \
        gettext-h \
        gettimeofday \
+       isfinite \
        intprops \
        inttostr \
        linebreak \
@@ -42,6 +43,7 @@
        printf-safe \
        progname \
        relocatable-prog \
+       round \
        snprintf \
        snprintf-posix \
        sprintf-posix \

Index: src/data/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- src/data/ChangeLog  27 Oct 2007 07:12:40 -0000      1.164
+++ src/data/ChangeLog  3 Nov 2007 02:32:37 -0000       1.165
@@ -1,3 +1,12 @@
+2007-11-02  Ben Pfaff  <address@hidden>
+
+       * data-out.c (output_number): Use isfinite (from C99) instead of
+       gsl_isfinite, since we now have universal support for it in
+       gnulib.
+       (output_infinite): Ditto.
+       [!HAVE_ROUND] (round): Remove definition, since we now have a
+       replacement in gnulib.
+
 2007-10-27  John Darrington <address@hidden>
 
        * dictionary.c: Fixed bug in dict_clone, where the vardict.dict member

Index: src/data/data-out.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/data-out.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/data/data-out.c 12 Oct 2007 04:49:26 -0000      1.18
+++ src/data/data-out.c 3 Nov 2007 02:32:38 -0000       1.19
@@ -24,7 +24,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gsl/gsl_math.h>
 
 #include "calendar.h"
 #include "format.h"
@@ -150,7 +149,7 @@
 
   if (number == SYSMIS)
     output_missing (format, output);
-  else if (!gsl_finite (number))
+  else if (!isfinite (number))
     output_infinite (number, format, output);
   else
     {
@@ -710,16 +709,6 @@
   return true;
 }
 
-#ifndef HAVE_ROUND
-/* Return X rounded to the nearest integer,
-   rounding ties away from zero. */
-static double
-round (double x)
-{
-  return x >= 0.0 ? floor (x + .5) : ceil (x - .5);
-}
-#endif /* !HAVE_ROUND */
-
 /* Returns true if the magnitude represented by R should be
    rounded up when chopped off at DECIMALS decimal places, false
    if it should be rounded down. */
@@ -948,7 +937,7 @@
 static void
 output_infinite (double number, const struct fmt_spec *format, char *output)
 {
-  assert (!gsl_finite (number));
+  assert (!isfinite (number));
 
   if (format->w >= 3)
     {