diff options
| author | Paul Eggert | 2017-02-23 09:14:06 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-02-23 09:15:06 -0800 |
| commit | 7204577bf90ba8574a0199680626a5ae3f075554 (patch) | |
| tree | 46062d3c37fa6cc291b9e0ce25a2f28992217094 /lib-src/hexl.c | |
| parent | 23e64facf9f74133c6bacedeec56ad782ae69b65 (diff) | |
| download | emacs-7204577bf90ba8574a0199680626a5ae3f075554.tar.gz 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/hexl.c')
| -rw-r--r-- | lib-src/hexl.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
| 76 | else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de")) | 76 | else if (!strcmp (*argv, "-un") || !strcmp (*argv, "-de")) |
| 77 | { | 77 | { |
| 78 | un_flag = true; | 78 | un_flag = true; |
| 79 | SET_BINARY (fileno (stdout)); | 79 | set_binary_mode (fileno (stdout), O_BINARY); |
| 80 | } | 80 | } |
| 81 | else if (!strcmp (*argv, "-hex")) | 81 | else if (!strcmp (*argv, "-hex")) |
| 82 | /* Hex is the default and is only base supported. */; | 82 | /* Hex is the default and is only base supported. */; |
| @@ -109,7 +109,7 @@ main (int argc, char **argv) | |||
| 109 | { | 109 | { |
| 110 | fp = stdin; | 110 | fp = stdin; |
| 111 | if (!un_flag) | 111 | if (!un_flag) |
| 112 | SET_BINARY (fileno (stdin)); | 112 | set_binary_mode (fileno (stdin), O_BINARY); |
| 113 | } | 113 | } |
| 114 | else | 114 | else |
| 115 | { | 115 | { |