diff options
| author | Paul Eggert | 2011-09-03 16:08:32 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-03 16:08:32 -0700 |
| commit | 7f59d9c856de33b97bc3f2708dcc8dadf24ee040 (patch) | |
| tree | eb0c7bb18b57498965581881a5cccd5f1de48166 /lib/lstat.c | |
| parent | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (diff) | |
| download | emacs-7f59d9c856de33b97bc3f2708dcc8dadf24ee040.tar.gz emacs-7f59d9c856de33b97bc3f2708dcc8dadf24ee040.zip | |
Merge from gnulib.
Diffstat (limited to 'lib/lstat.c')
| -rw-r--r-- | lib/lstat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/lstat.c b/lib/lstat.c index b26065ede28..29fc6d25f90 100644 --- a/lib/lstat.c +++ b/lib/lstat.c | |||
| @@ -17,6 +17,10 @@ | |||
| 17 | 17 | ||
| 18 | /* written by Jim Meyering */ | 18 | /* written by Jim Meyering */ |
| 19 | 19 | ||
| 20 | /* If the user's config.h happens to include <sys/stat.h>, let it include only | ||
| 21 | the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to | ||
| 22 | rpl_lstat. */ | ||
| 23 | #define __need_system_sys_stat_h | ||
| 20 | #include <config.h> | 24 | #include <config.h> |
| 21 | 25 | ||
| 22 | #if !HAVE_LSTAT | 26 | #if !HAVE_LSTAT |
| @@ -27,7 +31,6 @@ typedef int dummy; | |||
| 27 | #else /* HAVE_LSTAT */ | 31 | #else /* HAVE_LSTAT */ |
| 28 | 32 | ||
| 29 | /* Get the original definition of lstat. It might be defined as a macro. */ | 33 | /* Get the original definition of lstat. It might be defined as a macro. */ |
| 30 | # define __need_system_sys_stat_h | ||
| 31 | # include <sys/types.h> | 34 | # include <sys/types.h> |
| 32 | # include <sys/stat.h> | 35 | # include <sys/stat.h> |
| 33 | # undef __need_system_sys_stat_h | 36 | # undef __need_system_sys_stat_h |