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.

diff --git a/ChangeLog b/ChangeLog
index 7e1e8ea95441f9833c7f12548f322220973047d6..50a29eef7a57718636e9a0317bc154f6609b9504 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-12  Ben Pfaff  <blp@gnu.org>
+
+       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  <blp@gnu.org>
 
        * Smake: Add fprintf-posix, printf-posix, printf-safe,

diff --git a/acinclude.m4 b/acinclude.m4
index c281995bbe856380f4d08a407d434b0a3c77c40c..812f4d44f8950932cbe6fd7da050ac6364ad05f5 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -68,24 +68,6 @@ AC_DEFUN([PSPP_LIBPLOT],
   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)

diff --git a/configure.ac b/configure.ac
index a85e57bd5b7b189b94bf27d37e317b41d0e54b02..d16c6f49b625bc8c70e2a2968a1d6793417899cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,6 @@ AM_GNU_GETTEXT_VERSION([0.16.1])
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
-AC_FUNC_FSEEKO
 AC_CHECK_LIB(m, sin)
 PSPP_LIBPLOT
 PSPP_LC_PAPER
@@ -54,8 +53,6 @@ if test x"$with_gui_tools" = x"yes" ; then
 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)])])
 

diff --git a/src/language/stats/ChangeLog b/src/language/stats/ChangeLog
index 21e27f188a7d5df57788fe72c3d73e66f8c0ee3e..146640f3a32fb8258f24eeadf5ffaf57f9b64e11 100644 (file)
--- a/src/language/stats/ChangeLog
+++ b/src/language/stats/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12  Ben Pfaff  <blp@gnu.org>
+
+       * 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  <jhs@wonko.gcsu.edu>
 
        * regression.q (run_regression): Partial fix of memory leak, bug

diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c
index 2bcd1e4b873212d33f7201c322983afdf6646a90..3fe43eb90858993a54b0f23bb6dc2ea07265c28f 100644 (file)
--- a/src/language/stats/flip.c
+++ b/src/language/stats/flip.c
@@ -423,14 +423,6 @@ flip_file (struct flip_pgm *flip)
          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),