diff options
| author | Paul Eggert <eggert@Penguin.CS.UCLA.EDU> | 2017-08-16 13:55:46 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-08-16 14:04:33 -0700 |
| commit | 794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1 (patch) | |
| tree | 728839628834cbd80dc3bd8f795e9a5598fdffaf /lib/fcntl.in.h | |
| parent | 69f2b755f44a5e447b3ad482ce0b409764fa10e6 (diff) | |
| download | emacs-794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1.tar.gz emacs-794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1.tar.bz2 emacs-794c3cd3a2dfcedc829ccb5dc413c99fb670f4a1.zip | |
Merge from Gnulib; use ‘open’ for O_CLOEXEC
This incorporates:
2017-08-15 renameat: ensure declaration in <stdio.h> on NetBSD
2017-08-15 extensions: enable NetBSD specific extensions
2017-08-14 open: support O_CLOEXEC
2017-08-13 reallocarray: new module
* admin/merge-gnulib (AVOIDED_MODULES): Remove ‘open’, since
it now supports O_CLOEXEC and this simplifies Emacs.
* build-aux/config.guess, lib/fcntl.in.h, lib/stdio.in.h:
* lib/stdlib.in.h, m4/extensions.m4, m4/stdlib_h.m4:
Copy from Gnulib.
* lib/cloexec.c, lib/cloexec.h, lib/open.c:
* m4/mode_t.m4, m4/open-cloexec.m4, m4/open.m4:
New files, copied from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib-src/etags.c (O_CLOEXEC) [WINDOWSNT]:
Remove, as Gnulib does this for us.
* src/filelock.c (create_lock_file):
* src/sysdep.c (emacs_open, emacs_pipe):
Don’t worry about O_CLOEXEC == 0, as Gnulib no longer sets it to 0.
Diffstat (limited to 'lib/fcntl.in.h')
| -rw-r--r-- | lib/fcntl.in.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 4a1d40af6df..076d1ac34a7 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -213,7 +213,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " #endif #ifndef O_CLOEXEC -# define O_CLOEXEC 0 +# define O_CLOEXEC 0x40000000 /* Try to not collide with system O_* flags. */ +# define GNULIB_defined_O_CLOEXEC 1 +#else +# define GNULIB_defined_O_CLOEXEC 0 #endif #ifndef O_DIRECT |