diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-11 23:11:03 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-11 23:12:17 -0800 |
| commit | 7775c4729814431608c943643a490ad5f1f68a99 (patch) | |
| tree | 52e91e96f44f7ce92b158bfd6d4b442e63d647db /lib/unistd.in.h | |
| parent | e470d16448999e79df048b92ae1db4acaafb306f (diff) | |
| download | emacs-7775c4729814431608c943643a490ad5f1f68a99.tar.gz emacs-7775c4729814431608c943643a490ad5f1f68a99.tar.bz2 emacs-7775c4729814431608c943643a490ad5f1f68a99.zip | |
Merge from Gnulib
This incorporates:
2017-11-11 faccessat: port to macOS (Bug#29231)
2017-11-05 fstatat: pacify GCC on unusual platform
* build-aux/config.guess, build-aux/config.sub:
* doc/misc/texinfo.tex, lib/faccessat.c, lib/fstatat.c:
* lib/unistd.in.h, m4/faccessat.m4, m4/unistd_h.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/unistd.in.h')
| -rw-r--r-- | lib/unistd.in.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/unistd.in.h b/lib/unistd.in.h index ca8090a3526..91447835811 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -461,13 +461,25 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " #if @GNULIB_FACCESSAT@ -# if !@HAVE_FACCESSAT@ +# if @REPLACE_FACCESSAT@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef faccessat +# define faccessat rpl_faccessat +# endif +_GL_FUNCDECL_RPL (faccessat, int, + (int fd, char const *name, int mode, int flag) + _GL_ARG_NONNULL ((2))); +_GL_CXXALIAS_RPL (faccessat, int, + (int fd, char const *name, int mode, int flag)); +# else +# if !@HAVE_FACCESSAT@ _GL_FUNCDECL_SYS (faccessat, int, (int fd, char const *file, int mode, int flag) _GL_ARG_NONNULL ((2))); -# endif +# endif _GL_CXXALIAS_SYS (faccessat, int, (int fd, char const *file, int mode, int flag)); +# endif _GL_CXXALIASWARN (faccessat); #elif defined GNULIB_POSIXCHECK # undef faccessat |