aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdio-impl.h
diff options
context:
space:
mode:
authorPaul Eggert2019-01-27 16:20:03 -0800
committerPaul Eggert2019-01-27 16:20:40 -0800
commitd81aa8516ef6df79d6d602d4f732d8a65bf1677c (patch)
treec384271af4f60e82ab204d020e7e6e3367e87877 /lib/stdio-impl.h
parentcc1c46e4122a08657a7c75495115d1c60efb1b31 (diff)
downloademacs-d81aa8516ef6df79d6d602d4f732d8a65bf1677c.tar.gz
emacs-d81aa8516ef6df79d6d602d4f732d8a65bf1677c.zip
Update from Gnulib
This incorporates: 2019-01-26 getloadavg: Add support for Android 2019-01-24 fchownat: Fix compilation error on Android 4.3 2019-01-24 mbtowc: Fix compilation error on Android 4.3 2019-01-24 random: Fix compilation error on Android 4.3 2019-01-24 renameat: Fix compilation error on Android 4.3 2019-01-24 unlinkat: Fix compilation error on Android 4.3 2019-01-19 gettext: support disabling use of VLAs 2019-01-17 sys_stat: Fix warning on OS/2 kLIBC 2019-01-17 fcntl: Fix syntax error (regression from 2018-10-05) 2019-01-10 verify: Enable _GL_HAVE_STATIC_ASSERT for recent G++ 2018-12-22 stdioext: port to newer 32-bit Android 2018-12-16 libc-config: Support HP-UX cc in C99 mode. * build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex: * lib/cdefs.h, lib/fcntl.c, lib/getloadavg.c, lib/gettext.h: * lib/regexec.c, lib/stdio-impl.h, lib/stdio.in.h, lib/stdlib.in.h: * lib/sys_stat.in.h, lib/unistd.in.h, lib/verify.h, m4/stdlib_h.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/stdio-impl.h')
-rw-r--r--lib/stdio-impl.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index b2b2971f2ff..4260468b612 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -61,6 +61,11 @@
61# define _r pub._r 61# define _r pub._r
62# define _w pub._w 62# define _w pub._w
63# elif defined __ANDROID__ /* Android */ 63# elif defined __ANDROID__ /* Android */
64# ifdef __LP64__
65# define _gl_flags_file_t int
66# else
67# define _gl_flags_file_t short
68# endif
64 /* Up to this commit from 2015-10-12 69 /* Up to this commit from 2015-10-12
65 <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a> 70 <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
66 the innards of FILE were public, and fp_ub could be defined like for OpenBSD, 71 the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
@@ -70,8 +75,8 @@
70# define fp_ ((struct { unsigned char *_p; \ 75# define fp_ ((struct { unsigned char *_p; \
71 int _r; \ 76 int _r; \
72 int _w; \ 77 int _w; \
73 int _flags; \ 78 _gl_flags_file_t _flags; \
74 int _file; \ 79 _gl_flags_file_t _file; \
75 struct { unsigned char *_base; size_t _size; } _bf; \ 80 struct { unsigned char *_base; size_t _size; } _bf; \
76 int _lbfsize; \ 81 int _lbfsize; \
77 void *_cookie; \ 82 void *_cookie; \