diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-02-25 08:26:49 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-02-25 08:27:40 -0800 |
| commit | 0d49078ad80f54b810180a071e2b6b4bcc024851 (patch) | |
| tree | 44be6830a600b9802c4b6a08acbde97480624c50 /lib/fstatat.c | |
| parent | cedc3410d4feab7b4beeef3eab474fbabad4035c (diff) | |
| download | emacs-0d49078ad80f54b810180a071e2b6b4bcc024851.tar.gz | |
Update from Gnulib
This incorporates:
2019-02-24 nstrftime: support the ‘+’ flag
2019-02-24 stat, lstat: fix conflict with relocatable-prog-wrapper
2019-02-23 nstrftime: tweak arg order
2019-02-21 nstrftime: merge glibc strftime changes
2019-02-02 vla: add commentary about VLA_ELEMS
* build-aux/config.guess, doc/misc/texinfo.tex, lib/fstatat.c:
* lib/lstat.c, lib/nstrftime.c, lib/vla.h:
Copy from Gnulib.
Diffstat (limited to 'lib/fstatat.c')
| -rw-r--r-- | lib/fstatat.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/fstatat.c b/lib/fstatat.c index 515b5693991..019d3c61638 100644 --- a/lib/fstatat.c +++ b/lib/fstatat.c @@ -36,10 +36,14 @@ orig_fstatat (int fd, char const *filename, struct stat *buf, int flags) } #endif +#ifdef __osf__ /* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc eliminates this include because of the preliminary #include <sys/stat.h> above. */ -#include "sys/stat.h" +# include "sys/stat.h" +#else +# include <sys/stat.h> +#endif #include "stat-time.h" |