diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-24 17:55:00 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-24 17:55:39 -0800 |
| commit | a3d146fd8a6e8e2301edd2c9e95640fa346fb9d8 (patch) | |
| tree | ca1cd8fa5e55556f76e85fb95070b19c807a7e4c /lib | |
| parent | 72cf60e9dc8bcfa05157e6f5909c61037c3f7b0f (diff) | |
| download | emacs-a3d146fd8a6e8e2301edd2c9e95640fa346fb9d8.tar.gz | |
Update from Gnulib
This incorporates:
2020-02-24 getloadavg: don't use /usr/local when cross-compiling on AIX
2020-02-24 fcntl: add witness of gnulib override
* lib/fcntl.in.h, m4/getloadavg.m4: Copy from Gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fcntl.in.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index b2e1e5130d9..0a21c957baf 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -116,9 +116,15 @@ _GL_WARN_ON_USE (creat, "creat is not always POSIX compliant - " # endif _GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...)); _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_rpl_fcntl +# define GNULIB_defined_rpl_fcntl 1 +# endif # else # if !@HAVE_FCNTL@ _GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...)); +# if !GNULIB_defined_fcntl +# define GNULIB_defined_fcntl 1 +# endif # endif _GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...)); # endif |