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/stat.c | |
| parent | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (diff) | |
| download | emacs-7f59d9c856de33b97bc3f2708dcc8dadf24ee040.tar.gz emacs-7f59d9c856de33b97bc3f2708dcc8dadf24ee040.zip | |
Merge from gnulib.
Diffstat (limited to 'lib/stat.c')
| -rw-r--r-- | lib/stat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/stat.c b/lib/stat.c index f07370dd06b..6c354d1d357 100644 --- a/lib/stat.c +++ b/lib/stat.c | |||
| @@ -16,10 +16,13 @@ | |||
| 16 | 16 | ||
| 17 | /* written by Eric Blake */ | 17 | /* written by Eric Blake */ |
| 18 | 18 | ||
| 19 | /* If the user's config.h happens to include <sys/stat.h>, let it include only | ||
| 20 | the system's <sys/stat.h> here, so that orig_stat doesn't recurse to | ||
| 21 | rpl_stat. */ | ||
| 22 | #define __need_system_sys_stat_h | ||
| 19 | #include <config.h> | 23 | #include <config.h> |
| 20 | 24 | ||
| 21 | /* Get the original definition of stat. It might be defined as a macro. */ | 25 | /* Get the original definition of stat. It might be defined as a macro. */ |
| 22 | #define __need_system_sys_stat_h | ||
| 23 | #include <sys/types.h> | 26 | #include <sys/types.h> |
| 24 | #include <sys/stat.h> | 27 | #include <sys/stat.h> |
| 25 | #undef __need_system_sys_stat_h | 28 | #undef __need_system_sys_stat_h |