[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f0c590b: Update from Gnulib
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master f0c590b: Update from Gnulib |
Date: |
Thu, 8 Mar 2018 19:50:47 -0500 (EST) |
branch: master
commit f0c590b857415e94a8ed9ded0e9ba2f91ea2a3c7
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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 789f50e..7bc235d 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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f0c590b: Update from Gnulib,
Paul Eggert <=