Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1058 from stilor/fix-m4-against-glibc2.28
Fix m4 against glibc2.28
- Loading branch information
Showing
2 changed files
with
145 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e | ||
| Author: Paul Eggert <eggert@cs.ucla.edu> | ||
| Date: Mon Mar 5 10:56:29 2018 -0800 | ||
|
|
||
| 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. | ||
|
|
||
| --- | ||
| lib/fflush.c | 6 +++--- | ||
| lib/fpending.c | 2 +- | ||
| lib/fpurge.c | 2 +- | ||
| lib/freadahead.c | 2 +- | ||
| lib/freading.c | 2 +- | ||
| lib/fseeko.c | 4 ++-- | ||
| lib/stdio-impl.h | 6 ++++++ | ||
| 7 files changed, 15 insertions(+), 9 deletions(-) | ||
|
|
||
| --- a/lib/fflush.c | ||
| +++ b/lib/fflush.c | ||
| @@ -33,7 +33,7 @@ | ||
| #undef fflush | ||
|
|
||
|
|
||
| -#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 */ | ||
|
|
||
| /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ | ||
| static void | ||
| @@ -72,7 +72,7 @@ | ||
|
|
||
| #endif | ||
|
|
||
| -#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 */) | ||
|
|
||
| # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT | ||
| /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ | ||
| @@ -148,7 +148,7 @@ | ||
| if (stream == NULL || ! freading (stream)) | ||
| return fflush (stream); | ||
|
|
||
| -#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 */ | ||
|
|
||
| clear_ungetc_buffer_preserving_position (stream); | ||
|
|
||
| --- a/lib/fpending.c | ||
| +++ b/lib/fpending.c | ||
| @@ -32,7 +32,7 @@ | ||
| /* 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->_IO_write_ptr - fp->_IO_write_base; | ||
| #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | ||
| /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */ | ||
| --- a/lib/fpurge.c | ||
| +++ b/lib/fpurge.c | ||
| @@ -62,7 +62,7 @@ | ||
| /* 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 */ | ||
| fp->_IO_read_end = fp->_IO_read_ptr; | ||
| fp->_IO_write_ptr = fp->_IO_write_base; | ||
| /* Avoid memory leak when there is an active ungetc buffer. */ | ||
| --- a/lib/freadahead.c | ||
| +++ b/lib/freadahead.c | ||
| @@ -25,7 +25,7 @@ | ||
| size_t | ||
| freadahead (FILE *fp) | ||
| { | ||
| -#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 */ | ||
| if (fp->_IO_write_ptr > fp->_IO_write_base) | ||
| return 0; | ||
| return (fp->_IO_read_end - fp->_IO_read_ptr) | ||
| --- a/lib/freading.c | ||
| +++ b/lib/freading.c | ||
| @@ -31,7 +31,7 @@ | ||
| /* 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)); | ||
| --- a/lib/fseeko.c | ||
| +++ b/lib/fseeko.c | ||
| @@ -47,7 +47,7 @@ | ||
| #endif | ||
|
|
||
| /* These tests are based on fpurge.c. */ | ||
| -#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 */ | ||
| if (fp->_IO_read_end == fp->_IO_read_ptr | ||
| && fp->_IO_write_ptr == fp->_IO_write_base | ||
| && fp->_IO_save_base == NULL) | ||
| @@ -123,7 +123,7 @@ | ||
| return -1; | ||
| } | ||
|
|
||
| -#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 */ | ||
| fp->_flags &= ~_IO_EOF_SEEN; | ||
| fp->_offset = pos; | ||
| #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | ||
| --- a/lib/stdio-impl.h | ||
| +++ b/lib/stdio-impl.h | ||
| @@ -18,6 +18,12 @@ | ||
| the same implementation of stdio extension API, except that some fields | ||
| have different naming conventions, or their access requires some casts. */ | ||
|
|
||
| +/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this | ||
| + problem by defining it ourselves. FIXME: Do not rely on glibc | ||
| + internals. */ | ||
| +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN | ||
| +# define _IO_IN_BACKUP 0x100 | ||
| +#endif | ||
|
|
||
| /* BSD stdio derived implementations. */ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters