From 4af4a7797fd6fd0a18c8c957e7bbc2df4cb3f5bf Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 7 Sep 2011 21:40:44 +0000
Subject: [PATCH]

---
 MagickCore/nt-base.h        | 8 +++++---
 MagickCore/pixel-accessor.h | 2 ++
 MagickCore/pixel.h          | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index 39d980fc9..e0bb5b430 100644
--- 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 4a6dc33a0..21ed44420 100644
--- 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 59715fcfa..43011ad8d 100644
--- 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
 {
-- 
2.40.0