diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-08 16:50:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-08 16:50:41 -0800 |
| commit | f0c590b857415e94a8ed9ded0e9ba2f91ea2a3c7 (patch) | |
| tree | 297f2e91bd48fcb2d98ce5672adbc18ef47a2690 /lib/fpending.c | |
| parent | 6bc78d5b16b6bc56f3ef401c519de6ff2fff3111 (diff) | |
| download | emacs-f0c590b857415e94a8ed9ded0e9ba2f91ea2a3c7.tar.gz | |
Update from Gnulib
This includes:
2018-03-08 fflush: be more paranoid about libio.h change
* lib/fpending.c: Copy from Gnulib.
Diffstat (limited to 'lib/fpending.c')
| -rw-r--r-- | lib/fpending.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 */ |