(no commit message)

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 39d980fc925ae6fe5a7706498a779d529fc7e449..e0bb5b430bec9b57572625a21761a72cb6000afc 100644 (file)
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -369,11 +369,13 @@ extern MagickExport double
   NTElapsedTime(void),
   NTUserTime(void);
 
-extern MagickExport int
-  Exit(int),
+extern int
 #if !defined(__MINGW32__)
-  gettimeofday(struct timeval *,struct timezone *),
+  gettimeofday(struct timeval *,struct timezone *);
 #endif
+
+extern MagickExport int
+  Exit(int),
   IsWindows95(),
   NTCloseDirectory(DIR *),
   NTCloseLibrary(void *),

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 4a6dc33a07a07da67f404293e55738bcdd7cd7f2..21ed444207d1f1915ede1fd43c03ca49bc694047 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -27,6 +27,8 @@ extern "C" {
 #include <MagickCore/color.h>
 #include <MagickCore/image.h>
 
+#undef index
+
 static inline Quantum GetPixelAlpha(const Image *image,const Quantum *pixel)
 {
   return(pixel[image->channel_map[AlphaPixelChannel].channel]);

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 59715fcfa70018e5c4fba5a8d477091861e7403e..43011ad8d9d0228da1d73e74dadd358f24e6d574 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -26,6 +26,7 @@ extern "C" {
 #include <MagickCore/constitute.h>
 
 #define MaxPixelChannels  32
+#undef index
 
 typedef enum
 {