From e0aeebda1f9d0c7011ef09be2f5bf5b08caa5c2b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Feb 2012 15:24:07 +0200 Subject: [PATCH] Avoid MS-Windows compilation errors when struct stat is redefined. nt/inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions by other headers. --- nt/ChangeLog | 5 +++++ nt/inc/sys/stat.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/nt/ChangeLog b/nt/ChangeLog index 675e85c7945..81bf6a1e105 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2012-02-04 Eli Zaretskii + + * inc/sys/stat.h (_STAT_DEFINED): Define, to prevent redefinitions + by other headers. + 2011-11-27 Fabrice Popineau (tiny change) * inc/stdint.h (uint32_t, uint64_t) [_WIN64]: New typedefs. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index d09925db5ec..57fabff4b0c 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -97,6 +97,9 @@ struct stat { char st_gname[260]; }; +/* Prevent redefinition by other headers, e.g. wchar.h. */ +#define _STAT_DEFINED + _CRTIMP int __cdecl __MINGW_NOTHROW fstat (int, struct stat*); _CRTIMP int __cdecl __MINGW_NOTHROW chmod (const char*, int); _CRTIMP int __cdecl __MINGW_NOTHROW stat (const char*, struct stat*); -- 2.11.4.GIT