From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 9 Mar 2018 00:50:06 +0000 (-0800)
Subject: Update from Gnulib
X-Git-Tag: emacs-27.0.90~5534
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0c590b857415e94a8ed9ded0e9ba2f91ea2a3c7;p=emacs.git

Update from Gnulib

This includes:
2018-03-08 fflush: be more paranoid about libio.h change
* lib/fpending.c: Copy from Gnulib.
---

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
      <stdio.h>, 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 */