diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2019-08-29 15:16:01 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2019-08-29 15:16:01 +0200 |
| commit | f2dc3cacf74468c5b9f94ee6d4f6efd813b93152 (patch) | |
| tree | 015c82ceaacca209528d28b6df48f68b48fbfaa2 | |
| parent | Declare __dso_handle variable, bug 682282. (diff) | |
| download | emacs-patches-f2dc3cacf74468c5b9f94ee6d4f6efd813b93152.tar.gz emacs-patches-f2dc3cacf74468c5b9f94ee6d4f6efd813b93152.tar.bz2 emacs-patches-f2dc3cacf74468c5b9f94ee6d4f6efd813b93152.zip | |
Fix compilation with glibc-2.28, bug 681904.emacs-18.59-patches-12
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
| -rw-r--r-- | emacs/18.59/16_all_glibc-2.28.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/emacs/18.59/16_all_glibc-2.28.patch b/emacs/18.59/16_all_glibc-2.28.patch new file mode 100644 index 0000000..295188d --- /dev/null +++ b/emacs/18.59/16_all_glibc-2.28.patch @@ -0,0 +1,27 @@ +Fix compilation with glibc-2.28. +https://bugs.gentoo.org/681904 + +--- emacs-18.59-orig/src/ChangeLog ++++ emacs-18.59/src/ChangeLog +@@ -1,3 +1,9 @@ ++2019-08-29 Ulrich Mueller <ulm@gentoo.org> ++ ++ * s-linux.h (PENDING_OUTPUT_COUNT): Fix conditional for new ++ C libio names. This was wrong since a long time, but finally broke ++ when glibc-2.28 dropped libio.h. ++ + 2018-07-01 Ulrich Müller <ulm@gentoo.org> + + * x11term.c (x_init_1): Save the O_NONBLOCK bit, so that it won't +--- emacs-18.59-orig/src/s-linux.h ++++ emacs-18.59/src/s-linux.h +@@ -230,7 +230,8 @@ + /* we have non-standard standard I/O (iostream) ... */ + #ifdef emacs + #include <stdio.h> /* Get the definition of _IO_STDIO_H. */ +-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) ++#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) \ ++ || defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 + /* new C libio names */ + #define PENDING_OUTPUT_COUNT(FILE) \ + ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) |