diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-24 14:50:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-24 14:51:22 -0800 |
| commit | 1698036a43d9e2c55ead6216ea7156df8615da47 (patch) | |
| tree | 60bb61c907536ebc38c6b301fd754028b8a9b542 /lib/binary-io.h | |
| parent | fbce4757a874cc43806eb41b8637538b101c3c69 (diff) | |
| download | emacs-1698036a43d9e2c55ead6216ea7156df8615da47.tar.gz | |
Merge from gnulib
This incorporates:
2016-01-24 openat_proc_name: fix last '/' overwritten on OS/2 kLIBC
2016-01-24 closedir, dirfd, opendir: port to OpenSolaris 5.10
2016-01-15 detect utimes() correctly on OS/2 kLIBC
2016-01-15 openat_proc_name: port to OS/2 kLIBC
2016-01-14 stdint: check _INTPTR_T_DECLARED for intptr_t etc.
2016-01-14 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
2016-01-14 dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
2016-01-14 binary-io: don't put fd in binary mode if a console on EMX
2016-01-14 sig2str: list all signals on FreeBSD >= 7
2016-01-13 acl-permissions: port to USE_ACL==0 platforms
2016-01-12 mktime: rename macro to avoid glibc clash
2016-01-12 Port "$@" to OpenIndiana ksh93
2016-01-12 Port Universal Time settings to strict POSIX
* build-aux/gitlog-to-changelog, build-aux/update-copyright:
* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
* lib/binary-io.h, lib/dirent.in.h, lib/dirfd.c, lib/dup2.c:
* lib/fcntl.c, lib/fdopendir.c, lib/mktime.c, lib/openat-proc.c:
* lib/sig2str.h, lib/stdint.in.h, m4/dirfd.m4, m4/dup2.m4:
* m4/fcntl.m4, m4/utimes.m4:
Copy from gnulib.
* m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/binary-io.h')
| -rw-r--r-- | lib/binary-io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/binary-io.h b/lib/binary-io.h index d5c82335707..9f17c0d3987 100644 --- a/lib/binary-io.h +++ b/lib/binary-io.h @@ -60,7 +60,7 @@ set_binary_mode (int fd, int mode) /* SET_BINARY (fd); changes the file descriptor fd to perform binary I/O. */ -#ifdef __DJGPP__ +#if defined __DJGPP__ || defined __EMX__ # include <unistd.h> /* declares isatty() */ /* Avoid putting stdin/stdout in binary mode if it is connected to the console, because that would make it impossible for the user |