From f0c590b857415e94a8ed9ded0e9ba2f91ea2a3c7 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 8 Mar 2018 16:50:06 -0800 Subject: [PATCH] Update from Gnulib This includes: 2018-03-08 fflush: be more paranoid about libio.h change * lib/fpending.c: Copy from Gnulib. --- lib/fpending.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fpending.c b/lib/fpending.c index 789f50e4e4b..7bc235deda2 100644 --- a/lib/fpending.c +++ b/lib/fpending.c @@ -32,7 +32,8 @@ __fpending (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in , because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return fp->_IO_write_ptr - fp->_IO_write_base; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -- 2.39.2