(no commit message)

[imagemagick] / magick / MagickCore.h

diff --git a/magick/MagickCore.h b/magick/MagickCore.h
index 8557bc03bff8fd16f9b50454018cabaa0dada19e..2d695fd8c2217ecda78748c4317aae1eb2f89865 100644 (file)
--- a/magick/MagickCore.h
+++ b/magick/MagickCore.h
@@ -46,37 +46,13 @@ extern "C" {
 #include <stdlib.h>
 #include <sys/types.h>
 
-#if defined(__CYGWIN32__)
-#  if !defined(__CYGWIN__)
-#    define __CYGWIN__ __CYGWIN32__
-#  endif
-#endif
-
-#if defined(_WIN32) || defined(WIN32)
-#  if !defined(__WINDOWS__)
-#    if defined(_WIN32)
-#      define __WINDOWS__ _WIN32
-#    else
-#      if defined(WIN32)
-#        define __WINDOWS__ WIN32
-#      endif
-#    endif
-#  endif
-#endif
-
-#if defined(_WIN64) || defined(WIN64)
-#  if !defined(__WINDOWS__)
-#    if defined(_WIN64)
-#      define __WINDOWS__ _WIN64
-#    else
-#      if !defined(WIN64)
-#        define __WINDOWS__ WIN64
-#      endif
-#    endif
-#  endif
-#endif
+#if defined(WIN32) || defined(WIN64)
+#  define MAGICKCORE_WINDOWS_SUPPORT
+#else
+#  define MAGICKCORE_POSIX_SUPPORT
+#endif 
 
-#if defined(__WINDOWS__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
 #  define _MAGICKDLL_
 # endif
@@ -146,6 +122,7 @@ extern "C" {
 # include "magick/methods.h"
 #endif
 #include "magick/magick-type.h"
+#include "magick/accelerate.h"
 #include "magick/animate.h"
 #include "magick/annotate.h"
 #include "magick/artifact.h"
@@ -173,6 +150,7 @@ extern "C" {
 #include "magick/effect.h"
 #include "magick/enhance.h"
 #include "magick/exception.h"
+#include "magick/feature.h"
 #include "magick/fourier.h"
 #include "magick/fx.h"
 #include "magick/gem.h"
@@ -181,6 +159,7 @@ extern "C" {
 #include "magick/histogram.h"
 #include "magick/identify.h"
 #include "magick/image.h"
+#include "magick/image-view.h"
 #include "magick/layer.h"
 #include "magick/list.h"
 #include "magick/locale_.h"
@@ -193,6 +172,7 @@ extern "C" {
 #include "magick/mime.h"
 #include "magick/monitor.h"
 #include "magick/montage.h"
+#include "magick/morphology.h"
 #include "magick/option.h"
 #include "magick/paint.h"
 #include "magick/pixel.h"