Mercurial > mxe-octave
annotate src/build-m4-glibc2-28.patch @ 5895:2db7f803d55d release
librsb: Update to version 1.2.0.10 (bug #60042).
* src/librsb.mk: Update version and checksum. Remove work-around for fixed bug.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 19 Sep 2021 14:32:07 +0200 |
parents | aa24b03ebb89 |
children |
rev | line source |
---|---|
4905
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 # This file is based on a Debian patch: |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 # https://launchpadlibrarian.net/392968582/m4_1.4.18-1_1.4.18-1ubuntu1.diff.gz |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 diff -upr a/lib/fflush.c b/lib/fflush.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 --- a/lib/fflush.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 +++ b/lib/fflush.c 2018-08-08 16:12:40.522952171 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 @@ -33,7 +33,7 @@ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 #undef fflush |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 static void |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 @@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 #endif |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 @@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 if (stream == NULL || ! freading (stream)) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 return fflush (stream); |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 clear_ungetc_buffer_preserving_position (stream); |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 diff -upr a/lib/fpending.c b/lib/fpending.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 --- a/lib/fpending.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 +++ b/lib/fpending.c 2018-08-08 16:12:40.522952171 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 @@ -32,7 +32,7 @@ __fpending (FILE *fp) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 /* Most systems provide FILE as a struct and the necessary bitmask in |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 <stdio.h>, because they need it for implementing getc() and putc() as |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 fast macros. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 return fp->_IO_write_ptr - fp->_IO_write_base; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 diff -upr a/lib/fpurge.c b/lib/fpurge.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 --- a/lib/fpurge.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 +++ b/lib/fpurge.c 2018-08-08 16:12:40.522952171 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 @@ -62,7 +62,7 @@ fpurge (FILE *fp) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 /* Most systems provide FILE as a struct and the necessary bitmask in |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 <stdio.h>, because they need it for implementing getc() and putc() as |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 fast macros. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 fp->_IO_read_end = fp->_IO_read_ptr; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 fp->_IO_write_ptr = fp->_IO_write_base; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 /* Avoid memory leak when there is an active ungetc buffer. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 diff -upr a/lib/freadahead.c b/lib/freadahead.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 --- a/lib/freadahead.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 +++ b/lib/freadahead.c 2018-08-08 16:12:40.522952171 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 @@ -25,7 +25,7 @@ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 size_t |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 freadahead (FILE *fp) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 { |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 if (fp->_IO_write_ptr > fp->_IO_write_base) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 return 0; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 return (fp->_IO_read_end - fp->_IO_read_ptr) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 diff -upr a/lib/freading.c b/lib/freading.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 --- a/lib/freading.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 +++ b/lib/freading.c 2018-08-08 16:13:12.399618677 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 @@ -31,7 +31,7 @@ freading (FILE *fp) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 /* Most systems provide FILE as a struct and the necessary bitmask in |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 <stdio.h>, because they need it for implementing getc() and putc() as |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 fast macros. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 return ((fp->_flags & _IO_NO_WRITES) != 0 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 && fp->_IO_read_base != NULL)); |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 diff -upr a/lib/fseeko.c b/lib/fseeko.c |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
87 --- a/lib/fseeko.c 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
88 +++ b/lib/fseeko.c 2018-08-08 16:13:12.399618677 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
89 @@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
90 #endif |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
91 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
92 /* These tests are based on fpurge.c. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
93 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
94 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
95 if (fp->_IO_read_end == fp->_IO_read_ptr |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
96 && fp->_IO_write_ptr == fp->_IO_write_base |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
97 && fp->_IO_save_base == NULL) |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
98 @@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
99 return -1; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
100 } |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
101 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
102 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
103 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
104 fp->_flags &= ~_IO_EOF_SEEN; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
105 fp->_offset = pos; |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
106 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
107 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
108 diff -upr a/lib/stdio-impl.h b/lib/stdio-impl.h |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
109 --- a/lib/stdio-impl.h 2016-12-31 21:54:41.000000000 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
110 +++ b/lib/stdio-impl.h 2018-08-08 16:13:12.399618677 +0800 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
111 @@ -18,6 +18,12 @@ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
112 the same implementation of stdio extension API, except that some fields |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
113 have different naming conventions, or their access requires some casts. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
114 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
115 +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
116 + problem by defining it ourselves. FIXME: Do not rely on glibc |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
117 + internals. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
118 +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
119 +# define _IO_IN_BACKUP 0x100 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
120 +#endif |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
121 |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
122 /* BSD stdio derived implementations. */ |
aa24b03ebb89
build-m4: Add patch for glibc >= 2.28 (bug #55214).
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
123 |