summaryrefslogtreecommitdiff
path: root/lib/freading.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-03-05 10:56:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-03-05 11:24:12 -0800
commit4af4a4a71827c0bc5e0ec67af23edef4f15cee8e (patch)
treed963644620b0fd507673d4b2bc943eec2f77db44 /lib/freading.c
parent0404c9ae2845cbf93d71b295b67d6c8bd39382d8 (diff)
downloadgnulib-4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.tar.gz
fflush: adjust to glibc 2.28 libio.h removal
Problem reported by Daniel P. Berrangé in: https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.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): Check _IO_EOF_SEEN instead of _IO_ftrylockfile. * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]: Define if not already defined.
Diffstat (limited to 'lib/freading.c')
-rw-r--r--lib/freading.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/freading.c b/lib/freading.c
index 73c28acddf..c24d0c88ab 100644
--- a/lib/freading.c
+++ b/lib/freading.c
@@ -31,7 +31,7 @@ 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_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __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));