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 551b973b016ed9f8fed9700829fef77a4f07f457..5605fafb5e1e53e6c30d9ddfe4ecd64467e45b2a 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-11  Claudio Bley  <claudio.bley@googlemail.com>
+
+       * inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation
+       failures when wchar.h is included.
+
 2014-01-11  Fabrice Popineau  <fabrice.popineau@supelec.fr>
 
        * 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 d9a01ee112bf0be79fdf56f0050e1808d9fca8f9..7dfe78a27c3407bba303cc4ac86043f99a453133 100644 (file)
--- 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*);