summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9f4d76b)
Commit
3f5bf99e claimed that it is safe to declare __fpending twice,
but in reality this caused a regression on Dragonfly BSD. Reported by
GW in <https://lists.gnu.org/archive/html/bug-m4/2013-11/msg00000.html>,
<https://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00022.html>.
* m4/fpending.m4 (gl_FUNC_FPENDING): Check for declaration.
* lib/fpending.h (__fpending): Don't declare twice.
Signed-off-by: Eric Blake <eblake@redhat.com>
+2013-11-08 Eric Blake <eblake@redhat.com>
+
+ fpending: fix regression on DragonFly BSD
+ * m4/fpending.m4 (gl_FUNC_FPENDING): Check for declaration.
+ * lib/fpending.h (__fpending): Don't declare twice.
+ Reported by GW in
+ <https://lists.gnu.org/archive/html/bug-m4/2013-11/msg00000.html>
+
2013-11-05 Jim Meyering <meyering@fb.com>
hash: relax license to LGPLv2+, for libguestfs
2013-11-05 Jim Meyering <meyering@fb.com>
hash: relax license to LGPLv2+, for libguestfs
# include <stdio_ext.h>
#endif
# include <stdio_ext.h>
#endif
size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE;
#endif
size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE;
#endif
# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
AC_DEFUN([gl_FUNC_FPENDING],
[
AC_CHECK_HEADERS_ONCE([stdio_ext.h])
AC_DEFUN([gl_FUNC_FPENDING],
[
AC_CHECK_HEADERS_ONCE([stdio_ext.h])
+ fp_headers='
+ #include <stdio.h>
+ #if HAVE_STDIO_EXT_H
+ # include <stdio_ext.h>
+ #endif
+ '
AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending],
[
AC_LINK_IFELSE(
AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending],
[
AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <stdio.h>
- #if HAVE_STDIO_EXT_H
- # include <stdio_ext.h>
- #endif
- ]],
+ [AC_LANG_PROGRAM([$fp_headers],
[[return ! __fpending (stdin);]])],
[gl_cv_func___fpending=yes],
[gl_cv_func___fpending=no])
])
[[return ! __fpending (stdin);]])],
[gl_cv_func___fpending=yes],
[gl_cv_func___fpending=no])
])
+ if test $gl_cv_func___fpending = yes; then
+ AC_CHECK_DECLS([__fpending], [], [], [$fp_headers])
+ fi
])
AC_DEFUN([gl_PREREQ_FPENDING],
])
AC_DEFUN([gl_PREREQ_FPENDING],