aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdio-impl.h
diff options
context:
space:
mode:
authorPaul Eggert2017-09-17 12:56:00 -0700
committerPaul Eggert2017-09-17 13:06:54 -0700
commit6bbbc38b3421723521f7cdd4fd617a4fc889aceb (patch)
tree9cc9d4cd249578118ae6b22da617935a760cc891 /lib/stdio-impl.h
parent57249fb297237bb942ead1f7a0af0ac20811a9cf (diff)
downloademacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.tar.gz
emacs-6bbbc38b3421723521f7cdd4fd617a4fc889aceb.zip
Merge from Gnulib
This incorporates: 2017-09-16 manywarnings: port to GCC on 64-bit MS-Windows 2017-09-13 all: Replace many more http URLs by https URLs * build-aux/config.guess, build-aux/config.sub: * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex: * lib/allocator.h, lib/count-leading-zeros.h: * lib/count-trailing-zeros.h, lib/dup2.c, lib/filevercmp.c: * lib/fstatat.c, lib/fsync.c, lib/ftoastr.c, lib/ftoastr.h: * lib/intprops.h, lib/signal.in.h, lib/stdio-impl.h, lib/stdio.in.h: * lib/unistd.in.h, lib/utimens.c, m4/alloca.m4, m4/extern-inline.m4: * m4/fstatat.m4, m4/gnulib-common.m4, m4/manywarnings.m4: * m4/std-gnu11.m4, m4/sys_types_h.m4, m4/vararrays.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/stdio-impl.h')
-rw-r--r--lib/stdio-impl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
index 0d606c19c84..8960333687e 100644
--- a/lib/stdio-impl.h
+++ b/lib/stdio-impl.h
@@ -32,7 +32,7 @@
32 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ 32 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
33 33
34# if defined __DragonFly__ /* DragonFly */ 34# if defined __DragonFly__ /* DragonFly */
35 /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */ 35 /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/stdio/priv_stdio.h>. */
36# define fp_ ((struct { struct __FILE_public pub; \ 36# define fp_ ((struct { struct __FILE_public pub; \
37 struct { unsigned char *_base; int _size; } _bf; \ 37 struct { unsigned char *_base; int _size; } _bf; \
38 void *cookie; \ 38 void *cookie; \
@@ -49,7 +49,7 @@
49 fpos_t _offset; \ 49 fpos_t _offset; \
50 /* More fields, not relevant here. */ \ 50 /* More fields, not relevant here. */ \
51 } *) fp) 51 } *) fp)
52 /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-type=text/x-cvsweb-markup>. */ 52 /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdio.h>. */
53# define _p pub._p 53# define _p pub._p
54# define _flags pub._flags 54# define _flags pub._flags
55# define _r pub._r 55# define _r pub._r
@@ -60,7 +60,7 @@
60 60
61# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Minix 3, Android */ 61# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Minix 3, Android */
62 /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> 62 /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
63 and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */ 63 and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup> */
64 struct __sfileext 64 struct __sfileext
65 { 65 {
66 struct __sbuf _ub; /* ungetc buffer */ 66 struct __sbuf _ub; /* ungetc buffer */
@@ -81,7 +81,7 @@
81#ifdef __TANDEM /* NonStop Kernel */ 81#ifdef __TANDEM /* NonStop Kernel */
82# ifndef _IOERR 82# ifndef _IOERR
83/* These values were determined by the program 'stdioext-flags' at 83/* These values were determined by the program 'stdioext-flags' at
84 <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */ 84 <https://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
85# define _IOERR 0x40 85# define _IOERR 0x40
86# define _IOREAD 0x80 86# define _IOREAD 0x80
87# define _IOWRT 0x4 87# define _IOWRT 0x4
@@ -132,7 +132,7 @@ struct _gl_real_FILE
132# define fp_ ((struct _gl_real_FILE *) fp) 132# define fp_ ((struct _gl_real_FILE *) fp)
133 133
134/* These values were determined by a program similar to the one at 134/* These values were determined by a program similar to the one at
135 <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */ 135 <https://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
136# define _IOREAD 0x1 136# define _IOREAD 0x1
137# define _IOWRT 0x2 137# define _IOWRT 0x2
138# define _IORW 0x4 138# define _IORW 0x4