(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 54af9975ec519916b1cf549d04131138fd4bcbd7..68787f496d5cda37e47dcf1aac3277ae2a28556d 100644 (file)
--- 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 28671ec87dab34b7642cbd0433cd8284fb437e99..d70515aa3cbf956dbf87c8a9f32b9c646e320a49 100644 (file)
--- 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);