aboutsummaryrefslogtreecommitdiffstats
path: root/lib/fpending.c
diff options
context:
space:
mode:
authorPaul Eggert2018-03-07 17:55:44 -0800
committerPaul Eggert2018-03-07 17:56:28 -0800
commitbb1309f1eb7651b41f2b6b7fb97ddb86bb82160c (patch)
tree001c7043f496575a590372c217015f6e1f9fed72 /lib/fpending.c
parent1ac190553886ff20817d3dd218464e2fc6f9e42a (diff)
downloademacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.tar.gz
emacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.zip
Update from Gnulib
This includes: 2018-03-07 maint: write-file-hooks -> before-save-hook 2018-03-05 binary-io: pacify gcc -Wunused-parameter 2018-03-05 fflush: adjust to glibc 2.28 libio.h removal * build-aux/config.guess, build-aux/config.sub: * build-aux/gitlog-to-changelog, build-aux/install-sh: * build-aux/move-if-change, build-aux/update-copyright: * doc/misc/texinfo.tex, lib/binary-io.h, lib/fpending.c: * lib/stdio-impl.h: Copy from Gnulib.
Diffstat (limited to 'lib/fpending.c')
-rw-r--r--lib/fpending.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fpending.c b/lib/fpending.c
index c84e3a5b4ec..789f50e4e4b 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -32,7 +32,7 @@ __fpending (FILE *fp)
32 /* Most systems provide FILE as a struct and the necessary bitmask in 32 /* Most systems provide FILE as a struct and the necessary bitmask in
33 <stdio.h>, because they need it for implementing getc() and putc() as 33 <stdio.h>, because they need it for implementing getc() and putc() as
34 fast macros. */ 34 fast macros. */
35#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ 35#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
36 return fp->_IO_write_ptr - fp->_IO_write_base; 36 return fp->_IO_write_ptr - fp->_IO_write_base;
37#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ 37#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
38 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ 38 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */