summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/sys/time.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index c9fe372a4a2..646b472ba73 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-01 Eli Zaretskii <eliz@gnu.org>
+
+ * inc/sys/time.h [!_TIMEZONE_DEFINED]: Define _TIMEZONE_DEFINED to
+ avoid multiple definition errors on MinGW64.
+
2013-05-31 Eli Zaretskii <eliz@gnu.org>
* inc/sys/time.h (gettimeofday): Use '__restrict' instead of
diff --git a/nt/inc/sys/time.h b/nt/inc/sys/time.h
index e586aaee07e..308748437d4 100644
--- a/nt/inc/sys/time.h
+++ b/nt/inc/sys/time.h
@@ -28,6 +28,7 @@ struct timeval
#endif /* _W64 */
#ifndef _TIMEZONE_DEFINED
+#define _TIMEZONE_DEFINED
struct timezone
{
int tz_minuteswest; /* minutes west of Greenwich */