diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-08 16:42:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-03-08 16:43:10 -0800 |
| commit | 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad (patch) | |
| tree | 05c31a05170e02fea1b8991e7c5fb04ed9d581b8 /lib/freading.c | |
| parent | 53b73d9ef33e2b9e652933b0e3ce1a499908a19f (diff) | |
| download | gnulib-74d9d6a293d7462dea8f83e7fc5ac792e956a0ad.tar.gz | |
fflush: be more paranoid about libio.h change
Suggested by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
* lib/fbufmode.c (fbufmode):
* lib/fflush.c (clear_ungetc_buffer_preserving_position)
(disable_seek_optimization, rpl_fflush):
* lib/fpending.c (__fpending):
* lib/fpurge.c (fpurge):
* lib/freadable.c (freadable):
* lib/freadahead.c (freadahead):
* lib/freading.c (freading):
* lib/freadptr.c (freadptr):
* lib/freadseek.c (freadptrinc):
* lib/fseeko.c (fseeko):
* lib/fseterr.c (fseterr):
* lib/fwritable.c (fwritable):
* lib/fwriting.c (fwriting):
Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
Diffstat (limited to 'lib/freading.c')
| -rw-r--r-- | lib/freading.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/freading.c b/lib/freading.c index c24d0c88ab..790f92ca3b 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -31,7 +31,8 @@ freading (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->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); |