[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115979: Fix MS-Windows build with MinGW runtime 4.x
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r115979: Fix MS-Windows build with MinGW runtime 4.x. |
Date: |
Sat, 11 Jan 2014 14:49:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115979
revision-id: address@hidden
parent: address@hidden
author: Claudio Bley <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2014-01-11 16:48:51 +0200
message:
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.
modified:
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/inc/sys/stat.h stat.h-20091113204419-o5vbwnq5f7feedwu-8620
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-01-11 13:36:06 +0000
+++ b/nt/ChangeLog 2014-01-11 14:48:51 +0000
@@ -1,3 +1,8 @@
+2014-01-11 Claudio Bley <address@hidden>
+
+ * inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation
+ failures when wchar.h is included.
+
2014-01-11 Fabrice Popineau <address@hidden>
* inc/ms-w32.h (pthread_sigmask): Undefine if defined, for MinGW64.
=== modified file 'nt/inc/sys/stat.h'
--- a/nt/inc/sys/stat.h 2014-01-01 07:43:34 +0000
+++ b/nt/inc/sys/stat.h 2014-01-11 14:48:51 +0000
@@ -141,6 +141,13 @@
/* 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*);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115979: Fix MS-Windows build with MinGW runtime 4.x.,
Eli Zaretskii <=