fseeko: Add missing declaration on OSF/1 5.1.

* lib/stdio.in.h (fseeko): Test HAVE_DECL_FSEEKO, not HAVE_FSEEKO.
* m4/fseeko.m4 (gl_FUNC_FSEEKO): Test whether fseeko is declared.
* m4/stdio_h.m4 (gl_STDIO_H_DEFAULTS): Initialize HAVE_DECL_FSEEKO.
* modules/stdio (Makefile.am): Substitute HAVE_DECL_FSEEKO.
* doc/posix-functions/fseeko.texi: Mention the OSF/1 5.1 problem.

diff --git a/ChangeLog b/ChangeLog
index f72a000d1aae43e3260bd8f80614367ce179cb16..ab330a2573a5ac40731053367e5815490fb2d742 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-19  Bruno Haible  <bruno@clisp.org>
+
+       fseeko: Add missing declaration on OSF/1 5.1.
+       * lib/stdio.in.h (fseeko): Test HAVE_DECL_FSEEKO, not HAVE_FSEEKO.
+       * m4/fseeko.m4 (gl_FUNC_FSEEKO): Test whether fseeko is declared.
+       * m4/stdio_h.m4 (gl_STDIO_H_DEFAULTS): Initialize HAVE_DECL_FSEEKO.
+       * modules/stdio (Makefile.am): Substitute HAVE_DECL_FSEEKO.
+       * doc/posix-functions/fseeko.texi: Mention the OSF/1 5.1 problem.
+
 2010-12-19  Bruno Haible  <bruno@clisp.org>
 
        fchdir: Add missing declaration on OSF/1 5.1.

diff --git a/doc/posix-functions/fseeko.texi b/doc/posix-functions/fseeko.texi
index 4aea19d67e75a717e87945881cb2eedfd148d695..34095cfea7c6b29fb08a8cc4746e75e3586d05b0 100644 (file)
--- a/doc/posix-functions/fseeko.texi
+++ b/doc/posix-functions/fseeko.texi
@@ -13,7 +13,8 @@ This function is missing on some platforms:
 IRIX 5.3, OSF/1 4.0, Solaris 2.5.1, mingw.
 @item
 The declaration of @code{fseeko} in @code{<stdio.h>} is not enabled by default
-on some platforms: glibc 2.3.6.
+on some platforms:
+glibc 2.3.6, OSF/1 5.1.
 @item
 This function fails on seekable stdin, stdout, and stderr: cygwin <= 1.5.24.
 @end itemize

diff --git a/lib/stdio.in.h b/lib/stdio.in.h
index 4da4b777de4182e6c63e8a7e852b2907491a0d61..deca8bf5827e2842e2aa246cb0d8893464f68095 100644 (file)
--- a/lib/stdio.in.h
+++ b/lib/stdio.in.h
@@ -345,7 +345,7 @@ _GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
 # else
-#  if ! @HAVE_FSEEKO@
+#  if ! @HAVE_DECL_FSEEKO@
 _GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
                                _GL_ARG_NONNULL ((1)));
 #  endif

diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index b97df53377bdee9e5849be768222607db77d21d2..83b8c84d4097541f382d09ee74f07a696a0bdbda 100644 (file)
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -1,4 +1,4 @@
-# fseeko.m4 serial 9
+# fseeko.m4 serial 10
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,11 @@ AC_DEFUN([gl_FUNC_FSEEKO],
   AC_REQUIRE([gl_HAVE_FSEEKO])
   AC_REQUIRE([gl_STDIN_LARGE_OFFSET])
 
+  AC_CHECK_DECLS_ONCE([fseeko])
+  if test $ac_cv_have_decl_fseeko = no; then
+    HAVE_DECL_FSEEKO=0
+  fi
+
   if test $gl_cv_func_fseeko = no; then
     HAVE_FSEEKO=0
     gl_REPLACE_FSEEKO

diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4
index f5650cdeabc6a2f4dcabfe515c4077c398aa587a..4d96f8b6e5b4b35f579ec22a96dbb531cb37d965 100644 (file)
--- a/m4/stdio_h.m4
+++ b/m4/stdio_h.m4
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 31
+# stdio_h.m4 serial 32
 dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -95,6 +95,7 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS],
   GNULIB_VSPRINTF_POSIX=0;       AC_SUBST([GNULIB_VSPRINTF_POSIX])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_FPURGE=1;            AC_SUBST([HAVE_DECL_FPURGE])
+  HAVE_DECL_FSEEKO=1;            AC_SUBST([HAVE_DECL_FSEEKO])
   HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
   HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
   HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])

diff --git a/modules/stdio b/modules/stdio
index f27322eefdc15f39910980480289d5ee6b209d1e..0de399bbf037176d532eba695612a184a4623fec 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -73,6 +73,7 @@ stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
              < $(srcdir)/stdio.in.h | \
          sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+             -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \