# HG changeset patch # User Bruno Haible # Date 1307979399 -7200 # Node ID d9e175d5d217e8e058c770d82246ac4ad688bd2c # Parent 64c288a5020baae805dd0b15ee183ff5b58f1421 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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-06-13 Bruno Haible + + 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 ftello: Provide a non-inline replacement of ftell(). diff --git a/lib/stdio.in.h b/lib/stdio.in.h --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -461,25 +461,6 @@ _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 --- a/modules/fseek +++ b/modules/fseek @@ -22,7 +22,7 @@ License: -LGPL +LGPLv2+ Maintainer: Bruno Haible diff --git a/modules/fseeko b/modules/fseeko --- a/modules/fseeko +++ b/modules/fseeko @@ -10,6 +10,8 @@ extensions lseek stdio +# Just to guarantee consistency between fseek() and fseeko(). +fseek configure.ac-early: AC_REQUIRE([AC_FUNC_FSEEKO])