diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-01-30 21:43:40 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-01-30 21:43:40 +0100 |
| commit | 253e7e986ecff5d39654a22259b4e5018d71643b (patch) | |
| tree | 9ff207a355dc905bd94ac2bb87e049693f7b74f4 /lib/sys_stat.in.h | |
| parent | 21f2ead19f488624d78a0738ee8b75f320696819 (diff) | |
| download | gnulib-253e7e986ecff5d39654a22259b4e5018d71643b.tar.gz | |
sys_stat: Fix support for mingw64 and MSVC.
* lib/sys_stat.in.h (stat) [AIX]: Don't redefine 'stat' if the system
header files already do it.
(stat) [mingw, msvc]: Redefine the symbol to which stat is defined, not
stat itself.
Reported by Marc-André Lureau <marcandre.lureau@redhat.com>.
Diffstat (limited to 'lib/sys_stat.in.h')
| -rw-r--r-- | lib/sys_stat.in.h | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index 005ad2de34..36c4189ee3 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -616,14 +616,33 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - " /* We can't use the object-like #define stat rpl_stat, because of struct stat. This means that rpl_stat will not be used if the user does (stat)(a,b). Oh well. */ -# undef stat -# ifdef _LARGE_FILES +# if defined _AIX && defined stat && defined _LARGE_FILES /* With _LARGE_FILES defined, AIX (only) defines stat to stat64, so we have to replace stat64() instead of stat(). */ -# define stat stat64 # undef stat64 # define stat64(name, st) rpl_stat (name, st) -# else /* !_LARGE_FILES */ +# elif defined __MINGW32__ && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32i64. */ +# undef _stat32i64 +# define _stat32i64(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64. */ +# undef _stat64 +# define _stat64(name, st) rpl_stat (name, st) +# endif +# elif defined _MSC_VER && defined stat +# ifdef _USE_32BIT_TIME_T + /* The system headers define stat to _stat32. */ +# undef _stat32 +# define _stat32(name, st) rpl_stat (name, st) +# else + /* The system headers define stat to _stat64i32. */ +# undef _stat64i32 +# define _stat64i32(name, st) rpl_stat (name, st) +# endif +# else /* !(_AIX ||__MINGW32__ || _MSC_VER) */ +# undef stat # define stat(name, st) rpl_stat (name, st) # endif /* !_LARGE_FILES */ _GL_EXTERN_C int stat (const char *name, struct stat *buf) |