diff options
| author | Paul Eggert | 2017-07-13 19:24:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-07-13 19:24:49 -0700 |
| commit | 3128d5d10e702ccb0732d947370e539a54046fc9 (patch) | |
| tree | a2a3c95dcf1263d55ca63fb4675b43286a8351de /lib/stdio-impl.h | |
| parent | ab87dbad1d26fba4e33b62b4b5a840be77ae9aa5 (diff) | |
| download | emacs-3128d5d10e702ccb0732d947370e539a54046fc9.tar.gz emacs-3128d5d10e702ccb0732d947370e539a54046fc9.zip | |
Merge from gnulib
This incorporates:
2017-07-13 Improve cross-compilation guesses for native Windows
2017-07-11 More systematic m4 quoting and indentation
2017-07-10 Make sure $host and $host_os are defined when used
2017-07-03 stdioext: Port to OpenVMS
2017-06-24 xalloc-oversized: port to icc
* doc/misc/texinfo.tex, lib/fpending.c, lib/stdio-impl.h:
* lib/xalloc-oversized.h, m4/dirfd.m4, m4/gettimeofday.m4:
* m4/lstat.m4, m4/mktime.m4, m4/pselect.m4, m4/putenv.m4:
* m4/stdint.m4, m4/strtoimax.m4, m4/utimes.m4:
Copy from Gnulib.
Diffstat (limited to 'lib/stdio-impl.h')
| -rw-r--r-- | lib/stdio-impl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h index 75a945eb724..d5b5943fd7c 100644 --- a/lib/stdio-impl.h +++ b/lib/stdio-impl.h | |||
| @@ -99,6 +99,8 @@ | |||
| 99 | int _file; \ | 99 | int _file; \ |
| 100 | unsigned int _flag; \ | 100 | unsigned int _flag; \ |
| 101 | } *) fp) | 101 | } *) fp) |
| 102 | # elif defined __VMS /* OpenVMS */ | ||
| 103 | # define fp_ ((struct _iobuf *) fp) | ||
| 102 | # else | 104 | # else |
| 103 | # define fp_ fp | 105 | # define fp_ fp |
| 104 | # endif | 106 | # endif |