2 files changed, 10 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 03412aa23b9..10758d80872 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-26  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix incompatibilities between MinGW.org and MinGW64 headers.
+        * ntlib.c (struct timespec) [!_TIMEZONE_DEFINED]: Define the
+        struct only if _TIMEZONE_DEFINED is not defined.
+
 2013-03-23  cg  <chengang31@gmail.com>  (tiny change)
 
         * makefile.w32-in (LIB_SRC): Move before first use.
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index f43117457cb..849abc2ede5 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -34,11 +34,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ntlib.h"
 
+/* MinGW64 defines _TIMEZONE_DEFINED and defines 'struct timespec' in
+   its system headers.  */
+#ifndef _TIMEZONE_DEFINED
 struct timezone
 {
   int           tz_minuteswest; /* minutes west of Greenwich */
   int           tz_dsttime;     /* type of dst correction */
 };
+#endif
 
 #define MAXPATHLEN _MAX_PATH