# HG changeset patch # User Paul Eggert # Date 1376264176 25200 # Node ID 3efb2780c5ae0b0e9523598ce8daeb9201ec2ea4 # Parent ffcb567ed1f702e66c31dd5c4a09eac79b4b9e03 fpending: port to recent Cygwin change to stdio_ext.h Reported by LRN in . * lib/fpending.h: Don't worry about HAVE_DECL___FPENDING; just declare __fpending unless it's a macro. A duplicate decl shouldn't hurt. * m4/fpending.m4 (gl_FUNC_FPENDING): Check that an __fpending call compiles and links, instead of separately checking for decl and lib function. * modules/fpending (configure-ac): Adjust to fpending.m4's renaming of shell variable. diff -r ffcb567ed1f7 -r 3efb2780c5ae ChangeLog --- a/ChangeLog Sun Aug 11 08:35:08 2013 -0700 +++ b/ChangeLog Sun Aug 11 16:36:16 2013 -0700 @@ -1,3 +1,17 @@ +2013-08-11 Paul Eggert + + fpending: port to recent Cygwin change to stdio_ext.h + Reported by LRN in + . + * lib/fpending.h: Don't worry about HAVE_DECL___FPENDING; + just declare __fpending unless it's a macro. + A duplicate decl shouldn't hurt. + * m4/fpending.m4 (gl_FUNC_FPENDING): Check that an __fpending + call compiles and links, instead of separately checking for + decl and lib function. + * modules/fpending (configure-ac): + Adjust to fpending.m4's renaming of shell variable. + 2013-08-10 Paul Eggert sys_time: port to OpenBSD diff -r ffcb567ed1f7 -r 3efb2780c5ae lib/fpending.h --- a/lib/fpending.h Sun Aug 11 08:35:08 2013 -0700 +++ b/lib/fpending.h Sun Aug 11 16:36:16 2013 -0700 @@ -20,11 +20,10 @@ #include #include +#if HAVE_STDIO_EXT_H +# include +#endif -#if HAVE_DECL___FPENDING -# if HAVE_STDIO_EXT_H -# include -# endif -#else +#ifndef __fpending size_t __fpending (FILE *); #endif diff -r ffcb567ed1f7 -r 3efb2780c5ae m4/fpending.m4 --- a/m4/fpending.m4 Sun Aug 11 08:35:08 2013 -0700 +++ b/m4/fpending.m4 Sun Aug 11 16:36:16 2013 -0700 @@ -1,4 +1,4 @@ -# serial 19 +# serial 20 # Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -16,14 +16,19 @@ AC_DEFUN([gl_FUNC_FPENDING], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h]) - AC_CHECK_FUNCS_ONCE([__fpending]) - fp_headers=' -# include -# if HAVE_STDIO_EXT_H -# include -# endif -' - AC_CHECK_DECLS([__fpending], , , $fp_headers) + AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], + [ + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #if HAVE_STDIO_EXT_H + # include + #endif + ]], + [[return ! __fpending (stdin);]])], + [gl_cv_func___fpending=yes], + [gl_cv_func___fpending=no]) + ]) ]) AC_DEFUN([gl_PREREQ_FPENDING], diff -r ffcb567ed1f7 -r 3efb2780c5ae modules/fpending --- a/modules/fpending Sun Aug 11 08:35:08 2013 -0700 +++ b/modules/fpending Sun Aug 11 16:36:16 2013 -0700 @@ -10,7 +10,7 @@ configure.ac: gl_FUNC_FPENDING -if test $ac_cv_func___fpending = no; then +if test $gl_cv_func___fpending = no; then AC_LIBOBJ([fpending]) gl_PREREQ_FPENDING fi