diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-11 09:52:58 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-11 09:52:58 -0700 |
| commit | 3f44249e19c27e3cf87a0676dfdc4136f49539b3 (patch) | |
| tree | 0b842bf77a6121a2d9da02a119726ab025456f6b /lib | |
| parent | a98e7468321a83381758bd894b94f7c1c40c2991 (diff) | |
| download | emacs-3f44249e19c27e3cf87a0676dfdc4136f49539b3.tar.gz | |
Merge from gnulib, porting to Tru64.
* lib/lstat.c, lib/stat.c, m4/include_next.m4, m4/nocrash.m4:
* m4/signal_h.m4, m4/time_h.m4, m4/unistd_h.m4:
Merge from gnulib. This fixes a compilation error on Tru64 UNIX
aka OSF/1 5.1 DTK cc. There is also some mingw stuff here that
doesn't affect Emacs.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lstat.c | 5 | ||||
| -rw-r--r-- | lib/stat.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/lstat.c b/lib/lstat.c index 29fc6d25f90..d786288f2b7 100644 --- a/lib/lstat.c +++ b/lib/lstat.c @@ -42,7 +42,10 @@ orig_lstat (const char *filename, struct stat *buf) } /* Specification. */ -# include <sys/stat.h> +/* 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 <string.h> # include <errno.h> diff --git a/lib/stat.c b/lib/stat.c index 6c354d1d357..1002f161bfa 100644 --- a/lib/stat.c +++ b/lib/stat.c @@ -34,7 +34,10 @@ orig_stat (const char *filename, struct stat *buf) } /* Specification. */ -#include <sys/stat.h> +/* 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 <errno.h> #include <limits.h> |