aboutsummaryrefslogtreecommitdiffstats
path: root/lib/fpending.c
diff options
context:
space:
mode:
authorPaul Eggert2017-01-10 07:48:37 -0800
committerPaul Eggert2017-01-10 07:49:55 -0800
commitfa0a2b4e7c81f57aecc1d94df00588a4dd5c281d (patch)
tree31408852501056452a337677c8f5b80fd3c24e7c /lib/fpending.c
parent560a384038845e37228226313eccfc8d70132553 (diff)
downloademacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.tar.gz
emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.zip
Merge from gnulib
This incorporates: 2017-01-09 maint: time stamp -> timestamp 2017-01-07 stdioext: Port to Minix 3.2 and newer 2017-01-06 glob, intprops, xalloc: work around Clang bug 2017-01-02 revert copyright-year change to synced files * doc/misc/texinfo.tex, lib/fpending.c, lib/intprops.h, lib/mktime.c: * lib/stat-time.h, lib/stdio-impl.h, lib/time.in.h, lib/timespec.h: * lib/utimens.c, lib/xalloc-oversized.h: Copy from gnulib.
Diffstat (limited to 'lib/fpending.c')
-rw-r--r--lib/fpending.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fpending.c b/lib/fpending.c
index 8761c77ca66..c9b77866858 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -35,7 +35,7 @@ __fpending (FILE *fp)
35#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ 35#if defined _IO_ftrylockfile || __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, Android */ 38 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
39 return fp->_p - fp->_bf._base; 39 return fp->_p - fp->_bf._base;
40#elif defined __EMX__ /* emx+gcc */ 40#elif defined __EMX__ /* emx+gcc */
41 return fp->_ptr - fp->_buffer; 41 return fp->_ptr - fp->_buffer;