diff options
| author | Paul Eggert | 2018-03-07 17:55:44 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-03-07 17:56:28 -0800 |
| commit | bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c (patch) | |
| tree | 001c7043f496575a590372c217015f6e1f9fed72 /lib | |
| parent | 1ac190553886ff20817d3dd218464e2fc6f9e42a (diff) | |
| download | emacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.tar.gz emacs-bb1309f1eb7651b41f2b6b7fb97ddb86bb82160c.zip | |
Update from Gnulib
This includes:
2018-03-07 maint: write-file-hooks -> before-save-hook
2018-03-05 binary-io: pacify gcc -Wunused-parameter
2018-03-05 fflush: adjust to glibc 2.28 libio.h removal
* build-aux/config.guess, build-aux/config.sub:
* build-aux/gitlog-to-changelog, build-aux/install-sh:
* build-aux/move-if-change, build-aux/update-copyright:
* doc/misc/texinfo.tex, lib/binary-io.h, lib/fpending.c:
* lib/stdio-impl.h: Copy from Gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/binary-io.h | 6 | ||||
| -rw-r--r-- | lib/fpending.c | 2 | ||||
| -rw-r--r-- | lib/stdio-impl.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/lib/binary-io.h b/lib/binary-io.h index cce1301d56c..1f21fc051f6 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h | |||
| @@ -47,10 +47,8 @@ _GL_INLINE_HEADER_BEGIN | |||
| 47 | /* Use a function rather than a macro, to avoid gcc warnings | 47 | /* Use a function rather than a macro, to avoid gcc warnings |
| 48 | "warning: statement with no effect". */ | 48 | "warning: statement with no effect". */ |
| 49 | BINARY_IO_INLINE int | 49 | BINARY_IO_INLINE int |
| 50 | __gl_setmode (int fd, int mode) | 50 | __gl_setmode (int fd _GL_UNUSED, int mode _GL_UNUSED) |
| 51 | { | 51 | { |
| 52 | (void) fd; | ||
| 53 | (void) mode; | ||
| 54 | return O_BINARY; | 52 | return O_BINARY; |
| 55 | } | 53 | } |
| 56 | #endif | 54 | #endif |
| @@ -59,7 +57,7 @@ __gl_setmode (int fd, int mode) | |||
| 59 | extern int __gl_setmode_check (int); | 57 | extern int __gl_setmode_check (int); |
| 60 | #else | 58 | #else |
| 61 | BINARY_IO_INLINE int | 59 | BINARY_IO_INLINE int |
| 62 | __gl_setmode_check (int fd) { return 0; } | 60 | __gl_setmode_check (int fd _GL_UNUSED) { return 0; } |
| 63 | #endif | 61 | #endif |
| 64 | 62 | ||
| 65 | /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. | 63 | /* Set FD's mode to MODE, which should be either O_TEXT or O_BINARY. |
diff --git a/lib/fpending.c b/lib/fpending.c index c84e3a5b4ec..789f50e4e4b 100644 --- a/lib/fpending.c +++ b/lib/fpending.c | |||
| @@ -32,7 +32,7 @@ __fpending (FILE *fp) | |||
| 32 | /* Most systems provide FILE as a struct and the necessary bitmask in | 32 | /* Most systems provide FILE as a struct and the necessary bitmask in |
| 33 | <stdio.h>, because they need it for implementing getc() and putc() as | 33 | <stdio.h>, because they need it for implementing getc() and putc() as |
| 34 | fast macros. */ | 34 | fast macros. */ |
| 35 | #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ | 35 | #if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ |
| 36 | return fp->_IO_write_ptr - fp->_IO_write_base; | 36 | return fp->_IO_write_ptr - fp->_IO_write_base; |
| 37 | #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ | 37 | #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ |
| 38 | /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ | 38 | /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ |
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 78d896e9f55..05c5752a243 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h | |||
| @@ -18,6 +18,12 @@ | |||
| 18 | the same implementation of stdio extension API, except that some fields | 18 | the same implementation of stdio extension API, except that some fields |
| 19 | have different naming conventions, or their access requires some casts. */ | 19 | have different naming conventions, or their access requires some casts. */ |
| 20 | 20 | ||
| 21 | /* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this | ||
| 22 | problem by defining it ourselves. FIXME: Do not rely on glibc | ||
| 23 | internals. */ | ||
| 24 | #if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN | ||
| 25 | # define _IO_IN_BACKUP 0x100 | ||
| 26 | #endif | ||
| 21 | 27 | ||
| 22 | /* BSD stdio derived implementations. */ | 28 | /* BSD stdio derived implementations. */ |
| 23 | 29 | ||