From: Claudio Bley Date: Sat, 11 Jan 2014 14:48:51 +0000 (+0200) Subject: Fix MS-Windows build with MinGW runtime 4.x. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2^2~20 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0b5cd897f387dfc3d72857d57734407178840b4;p=emacs.git 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. --- diff --git a/nt/ChangeLog b/nt/ChangeLog index 551b973b016..5605fafb5e1 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2014-01-11 Claudio Bley + + * inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation + failures when wchar.h is included. + 2014-01-11 Fabrice Popineau * 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 d9a01ee112b..7dfe78a27c3 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*);