diff options
| author | Claudio Bley <[email protected]> | 2014-01-11 16:48:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2014-01-11 16:48:51 +0200 |
| commit | f0b5cd897f387dfc3d72857d57734407178840b4 (patch) | |
| tree | f8c69c8afceb360d22f36d1fdc33889a1f68859f /nt | |
| parent | 5d1a2888576990e60c95cdd15f21a1fbb6343fdd (diff) | |
Fix MS-Windows build with MinGW runtime 4.x.
nt/inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation
failures when wchar.h is included.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/inc/sys/stat.h | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 551b973b01..5605fafb5e 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2014-01-11 Claudio Bley <[email protected]> + + * inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation + failures when wchar.h is included. + 2014-01-11 Fabrice Popineau <[email protected]> * inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64. diff --git a/nt/inc/sys/stat.h b/nt/inc/sys/stat.h index d9a01ee112..7dfe78a27c 100644 --- a/nt/inc/sys/stat.h +++ b/nt/inc/sys/stat.h @@ -141,6 +141,13 @@ extern int w32_stat_get_owner_group; /* Prevent redefinition by other headers, e.g. wchar.h. */ #define _STAT_DEFINED +/* This prevents definition in MinGW's wchar.h of inline functions + that use struct _stat64i32 etc., which we don't define and don't + support in our implementation of 'stat' and 'fstat'. If we don't + prevent definition of those inline functions, any program (e.g., + test programs run by configure) that includes both wchar.h and + sys/stat.h will fail to compile. */ +#define _WSTAT_DEFINED int __cdecl __MINGW_NOTHROW fstat (int, struct stat*); int __cdecl __MINGW_NOTHROW stat (const char*, struct stat*); |