From 6b0cc4b28beea0f3a293c464dac8efbb4353c4a2 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 13 Oct 2011 17:17:42 +0000 Subject: [PATCH] --- MagickCore/nt-base-private.h | 3 +++ MagickCore/nt-base.h | 4 ---- MagickWand/animate.c | 1 + MagickWand/display.c | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h index 659122a32..6f884df80 100644 --- a/MagickCore/nt-base-private.h +++ b/MagickCore/nt-base-private.h @@ -135,6 +135,9 @@ extern "C" { #if !defined(inline) # define inline __inline #endif +#if !defined(isatty) +# define isatty _isatty +#endif #if !defined(locale_t) #define locale_t _locale_t #endif diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h index cceb5ea75..08c111ff3 100644 --- a/MagickCore/nt-base.h +++ b/MagickCore/nt-base.h @@ -24,10 +24,6 @@ extern "C" { #include "MagickCore/geometry.h" -#if !defined(isatty) -# define isatty _isatty -#endif - #if defined(MAGICKCORE_WINDOWS_SUPPORT) extern MagickExport void *CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *), diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 2c8c0aee8..0b09f453a 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -44,6 +44,7 @@ #include "MagickWand/MagickWand.h" #include "MagickWand/mogrify-private.h" #include "MagickCore/animate-private.h" +#include "MagickCore/nt-base-private.h" #include "MagickCore/string-private.h" #include "MagickCore/xwindow-private.h" diff --git a/MagickWand/display.c b/MagickWand/display.c index dd164ed98..1c8f6a41f 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -45,6 +45,7 @@ #include "MagickWand/MagickWand.h" #include "MagickWand/mogrify-private.h" #include "MagickCore/display-private.h" +#include "MagickCore/nt-base-private.h" #include "MagickCore/string-private.h" #include "MagickCore/xwindow-private.h" -- 2.40.0