diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-23 09:14:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-02-23 09:15:06 -0800 |
| commit | 7204577bf90ba8574a0199680626a5ae3f075554 (patch) | |
| tree | 46062d3c37fa6cc291b9e0ce25a2f28992217094 /lib-src | |
| parent | 23e64facf9f74133c6bacedeec56ad782ae69b65 (diff) | |
| download | emacs-7204577bf90ba8574a0199680626a5ae3f075554.tar.gz emacs-7204577bf90ba8574a0199680626a5ae3f075554.tar.bz2 emacs-7204577bf90ba8574a0199680626a5ae3f075554.zip | |
Merge from gnulib
This incorporates:
2017-02-16 xbinary-io: rename from xsetmode
2017-02-15 xsetmode: new module
* lib-src/etags.c (main):
* lib-src/hexl.c (main):
* src/emacs.c (main) [MSDOS]:
Prefer set_binary_mode to the obsolescent SET_BINARY.
* lib/binary-io.c, lib/binary-io.h: Copy from gnulib.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/etags.c | 2 | ||||
| -rw-r--r-- | lib-src/hexl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c index 1b6ac83c9a8..39b90cc6cbf 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -1255,7 +1255,7 @@ main (int argc, char **argv) if (streq (tagfile, "-")) { tagf = stdout; - SET_BINARY (fileno (stdout)); + set_binary_mode (STDOUT_FILENO, O_BINARY); } else tagf = fopen (tagfile, append_to_tagfile ? "ab" : "wb"); diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 2c7e8c44161..319ce8bc890 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c @@ -76,7 +76,7 @@ main (int argc, char **argv) else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de")) { un_flag = true; - SET_BINARY (fileno (stdout)); + set_binary_mode (fileno (stdout), O_BINARY); } else if (!strcmp (*argv, "-hex")) /* Hex is the default and is only base supported. */; @@ -109,7 +109,7 @@ main (int argc, char **argv) { fp = stdin; if (!un_flag) - SET_BINARY (fileno (stdin)); + set_binary_mode (fileno (stdin), O_BINARY); } else { |