fseeko: Provide a non-inline replacement of fseek().

* lib/stdio.in.h (fseek): Don't provide if module 'fseek' is not used.
* modules/fseeko (Depends-on): Add fseek.
* modules/fseek (License): Change to LGPLv2+.

diff --git a/ChangeLog b/ChangeLog
index d89b38708fef54378038575cc8f5bb7259c6a76e..95a9a875a3acb8784046370c7386aa7a7c7eebd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-13  Bruno Haible  <bruno@clisp.org>
+
+       fseeko: Provide a non-inline replacement of fseek().
+       * lib/stdio.in.h (fseek): Don't provide if module 'fseek' is not used.
+       * modules/fseeko (Depends-on): Add fseek.
+       * modules/fseek (License): Change to LGPLv2+.
+
 2011-06-13  Bruno Haible  <bruno@clisp.org>
 
        ftello: Provide a non-inline replacement of ftell().

diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index fee5b65cff6d4f0108a2a60cdaf826b6e7b772a0..edf521a8bb541465fc56dfd1b7fc09cd8b3696c9 100644 (file)
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -461,25 +461,6 @@ _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
 # endif
 _GL_CXXALIASWARN (fseeko);
-# if (@REPLACE_FSEEKO@ || !@HAVE_FSEEKO@) && !@GNULIB_FSEEK@
-   /* Provide an fseek function that is consistent with fseeko.  */
-   /* In order to avoid that fseek gets defined as a macro here, the
-      developer can request the 'fseek' module.  */
-#  if !GNULIB_defined_fseek_function
-#   undef fseek
-#   define fseek rpl_fseek
-static inline int _GL_ARG_NONNULL ((1))
-rpl_fseek (FILE *fp, long offset, int whence)
-{
-#   if @REPLACE_FSEEKO@
-  return rpl_fseeko (fp, offset, whence);
-#   else
-  return fseeko (fp, offset, whence);
-#   endif
-}
-#   define GNULIB_defined_fseek_function 1
-#  endif
-# endif
 #elif defined GNULIB_POSIXCHECK
 # define _GL_FSEEK_WARN /* Category 1, above.  */
 # undef fseek

diff --git a/modules/fseek b/modules/fseek
index ef0d4bb8d78327901101ffe5fc41817e596d4869..87ab89ecb08e0e5e0e023ec5fef7c2c075fff846 100644 (file)
--- a/modules/fseek
+++ b/modules/fseek
@@ -22,7 +22,7 @@ Include:
 <stdio.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

diff --git a/modules/fseeko b/modules/fseeko
index 62464e64cb34c74d61cefdf4f3a93a754757bfe0..07f78e5550b4456cc99d721c74e9733101a5f296 100644 (file)
--- a/modules/fseeko
+++ b/modules/fseeko
@@ -10,6 +10,8 @@ Depends-on:
 extensions
 lseek
 stdio
+# Just to guarantee consistency between fseek() and fseeko().
+fseek
 
 configure.ac-early:
 AC_REQUIRE([AC_FUNC_FSEEKO])