From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 24 Apr 2010 17:12:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9591
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9acb8640cf14f318baeece9a2697a089b8ce1c0b;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 54af9975e..68787f496 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-04-24.6.1-6 Cristy  <quetzlzacatenango@image...>
+  * Do not declare timestruct under MinGW.
+
 2010-04-17  6.6.1-5 Cristy  <quetzlzacatenango@image...>
   * Only write one ICC profile to PSD image.
   * Sync image colormap for PNG tRNS chunks.
diff --git a/magick/nt-base.h b/magick/nt-base.h
index 28671ec87..d70515aa3 100644
--- a/magick/nt-base.h
+++ b/magick/nt-base.h
@@ -288,12 +288,14 @@ typedef struct _NTMEMORYSTATUSEX
     ullAvailExtendedVirtual;
 } NTMEMORYSTATUSEX;
 
+#if !defined(__MINGW32__)
 struct timezone
 {
   int
     tz_minuteswest,
     tz_dsttime;
 };
+#endif
 
 typedef UINT
   (CALLBACK *LPFNDLLFUNC1)(DWORD,UINT);