[people/pmueller/ipfire-2.x.git] / src / patches / bison-3.0.5-gnulib-fseterr.patch

commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
Author: Paul Eggert <address@hidden>
Date:   Mon Mar 5 10:56:29 2018 -0800

    fflush: adjust to glibc 2.28 libio.h removal
    (Only part of this commit was backported as needed.)

diff -Nrup a/lib/fseterr.c b/lib/fseterr.c
--- a/lib/fseterr.c	2018-05-08 06:02:48.000000000 -0400
+++ b/lib/fseterr.c	2018-08-14 16:06:19.636282264 -0400
@@ -29,7 +29,7 @@ fseterr (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 || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+#if defined _IO_EOF_SEEN ||  __GNU_LIBRARY__ == 1
   /* GNU libc, BeOS, Haiku, Linux libc5 */
   fp->_flags |= _IO_ERR_SEEN;
 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
Commit	Line	Data
68dba55d MT	1	commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
	2	Author: Paul Eggert <address@hidden>
	3	Date: Mon Mar 5 10:56:29 2018 -0800
	4
	5	fflush: adjust to glibc 2.28 libio.h removal
	6	(Only part of this commit was backported as needed.)
	7
	8	diff -Nrup a/lib/fseterr.c b/lib/fseterr.c
	9	--- a/lib/fseterr.c 2018-05-08 06:02:48.000000000 -0400
	10	+++ b/lib/fseterr.c 2018-08-14 16:06:19.636282264 -0400
	11	@@ -29,7 +29,7 @@ fseterr (FILE *fp)
	12	/* Most systems provide FILE as a struct and the necessary bitmask in
	13	<stdio.h>, because they need it for implementing getc() and putc() as
	14	fast macros. */
	15	-#if defined _IO_EOF_SEEN \|\| defined _IO_ftrylockfile \|\| __GNU_LIBRARY__ == 1
	16	+#if defined _IO_EOF_SEEN \|\| __GNU_LIBRARY__ == 1
	17	/* GNU libc, BeOS, Haiku, Linux libc5 */
	18	fp->_flags \|= _IO_ERR_SEEN;
	19	#elif defined __sferror \|\| defined __DragonFly__ \|\| defined __ANDROID__