diff options
| -rw-r--r-- | nt/ChangeLog | 5 | ||||
| -rw-r--r-- | nt/inc/sys/time.h | 1 |
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 @@ | |||
| 1 | 2013-06-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * inc/sys/time.h [!_TIMEZONE_DEFINED]: Define _TIMEZONE_DEFINED to | ||
| 4 | avoid multiple definition errors on MinGW64. | ||
| 5 | |||
| 1 | 2013-05-31 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-05-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * inc/sys/time.h (gettimeofday): Use '__restrict' instead of | 8 | * 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 | |||
| 28 | #endif /* _W64 */ | 28 | #endif /* _W64 */ |
| 29 | 29 | ||
| 30 | #ifndef _TIMEZONE_DEFINED | 30 | #ifndef _TIMEZONE_DEFINED |
| 31 | #define _TIMEZONE_DEFINED | ||
| 31 | struct timezone | 32 | struct timezone |
| 32 | { | 33 | { |
| 33 | int tz_minuteswest; /* minutes west of Greenwich */ | 34 | int tz_minuteswest; /* minutes west of Greenwich */ |