[Pspp-cvs] pspp ChangeLog acinclude.m4 configure.ac src/la...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/10/13 04:40:07

Modified files:
        .              : ChangeLog acinclude.m4 configure.ac 
        src/language/stats: ChangeLog flip.c 

Log message:
        Use fseeko module from gnulib instead of our home-grown solution.
        Patch #6228.
        
        * flip.c (flip_file): No need to conditionally substitute for
        "fseeko" and "off_t" manually anymore, as gnulib takes care of it
        for us.
        
        * acinclude.m4: Delete PSPP_OFF_T macro.
        
        * configure.ac: Don't call AC_FUNC_FSEEKO or PSPP_OFF_T.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/pspp/acinclude.m4?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/flip.c?cvsroot=pspp&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- ChangeLog   13 Oct 2007 04:35:25 -0000      1.89
+++ ChangeLog   13 Oct 2007 04:40:06 -0000      1.90
@@ -1,5 +1,14 @@
 2007-10-12  Ben Pfaff  <address@hidden>
 
+       Use fseeko module from gnulib instead of our home-grown solution.
+       Patch #6228.
+
+       * acinclude.m4: Delete PSPP_OFF_T macro.
+
+       * configure.ac: Don't call AC_FUNC_FSEEKO or PSPP_OFF_T.
+
+2007-10-12  Ben Pfaff  <address@hidden>
+
        * Smake: Add fprintf-posix, printf-posix, printf-safe,
        snprintf-posix, sprintf-posix, vasprintf-posxi, vfprintf-posix,
        vprintf-posix, vsnprintf-posix, and vsprintf-posix modules, which

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/pspp/pspp/acinclude.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- acinclude.m4        11 Oct 2007 04:59:34 -0000      1.14
+++ acinclude.m4        13 Oct 2007 04:40:07 -0000      1.15
@@ -68,24 +68,6 @@
   fi
 ])
 
-dnl Check that off_t is defined as an integer type.
-dnl Solaris sometimes declares it as a struct, if it
-dnl thinks that the compiler does not support `long long'.
-AC_DEFUN([PSPP_OFF_T],
-[
-  AC_COMPILE_IFELSE([#include <sys/types.h>
-  #include <unistd.h>
-  off_t x = 0;
-  int main (void) 
-  { 
-    lseek (0, 1, 2);
-    return 0;
-  }], [], [AC_MSG_ERROR(
-  [Your system's definition of off_t is broken.  You are probably
-  using Solaris.  You can probably fix the problem with
-  `--disable-largefile' or `CFLAGS=-ansi'.])])
-])
-
 dnl Check whether a C compiler option is accepted.
 dnl If so, add it to CFLAGS.
 dnl Example: PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)

Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- configure.ac        11 Oct 2007 04:59:34 -0000      1.65
+++ configure.ac        13 Oct 2007 04:40:07 -0000      1.66
@@ -27,7 +27,6 @@
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
 PSPP_LIBPLOT
 PSPP_LC_PAPER
@@ -54,8 +53,6 @@
 fi
 AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
 
-PSPP_OFF_T
-
 AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
 AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 
or later)])])
 

Index: src/language/stats/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/language/stats/ChangeLog        21 Sep 2007 20:48:14 -0000      1.67
+++ src/language/stats/ChangeLog        13 Oct 2007 04:40:07 -0000      1.68
@@ -1,3 +1,9 @@
+2007-10-12  Ben Pfaff  <address@hidden>
+
+       * flip.c (flip_file): No need to conditionally substitute for
+       "fseeko" and "off_t" manually anymore, as gnulib takes care of it
+       for us.
+
 2007-09-21  Jason Stover  <address@hidden>
 
        * regression.q (run_regression): Partial fix of memory leak, bug

Index: src/language/stats/flip.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/flip.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/language/stats/flip.c   12 Oct 2007 04:59:28 -0000      1.30
+++ src/language/stats/flip.c   13 Oct 2007 04:40:07 -0000      1.31
@@ -423,14 +423,6 @@
          for (j = 0; j < read_cases; j++)
            output_buf[j] = input_buf[i + j * flip->var_cnt];
 
-#ifndef HAVE_FSEEKO
-#define fseeko fseek
-#endif
-
-#ifndef HAVE_OFF_T
-#define off_t long int
-#endif
-
          if (fseeko (output_file,
                       sizeof *input_buf * (case_idx
                                            + (off_t) i * flip->case_cnt),