From: cristy Date: Mon, 20 Feb 2012 16:36:50 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6150 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a6fc8fdc1e2c323984295fb66285e1b02fb094;p=imagemagick --- diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am index 6020fff26..737238a36 100644 --- a/MagickCore/Makefile.am +++ b/MagickCore/Makefile.am @@ -176,7 +176,7 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/morphology.h \ MagickCore/morphology-private.h \ MagickCore/nt-base.h \ - MagickCore/nt-base-private.h \ + MagickCore/nt-feature.h \ MagickCore/option.c \ MagickCore/option.h \ MagickCore/paint.c \ @@ -412,7 +412,8 @@ MAGICKCORE_NOINST_HDRS = \ MagickCore/module-private.h \ MagickCore/monitor-private.h \ MagickCore/morphology-private.h \ - MagickCore/nt-base-private.h \ + MagickCore/nt-base.h \ + MagickCore/nt-feature.h \ MagickCore/policy-private.h \ MagickCore/profile-private.h \ MagickCore/quantum-private.h \ @@ -449,7 +450,7 @@ MAGICKCORE_EXTRA_DIST = \ MagickCore/config.h_vms \ MagickCore/mac.c \ MagickCore/nt-base.c \ - MagickCore/nt-featur.c \ + MagickCore/nt-feature.c \ MagickCore/vms.c \ MagickCore/xwdfile.h_vms diff --git a/MagickCore/blob-private.h b/MagickCore/blob-private.h index fcddbc1a4..2c14b22d9 100644 --- a/MagickCore/blob-private.h +++ b/MagickCore/blob-private.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include "MagickCore/nt-base-private.h" +#include "MagickCore/nt-feature.h" #define MagickMinBlobExtent 32767L #if defined(MAGICKCORE_HAVE_FSEEKO) diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h index f1ed9733e..ebe137a10 100644 --- a/MagickCore/utility-private.h +++ b/MagickCore/utility-private.h @@ -23,7 +23,7 @@ extern "C" { #endif #include "MagickCore/memory_.h" -#include "MagickCore/nt-base-private.h" +#include "MagickCore/nt-feature.h" extern MagickPrivate char **GetPathComponents(const char *,size_t *), diff --git a/Makefile.in b/Makefile.in index 2e2a8789d..30d5cc462 100644 --- a/Makefile.in +++ b/Makefile.in @@ -434,7 +434,7 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST = \ MagickCore/montage.c MagickCore/montage.h \ MagickCore/morphology.c MagickCore/morphology.h \ MagickCore/morphology-private.h MagickCore/nt-base.h \ - MagickCore/nt-base-private.h MagickCore/option.c \ + MagickCore/nt-feature.h MagickCore/option.c \ MagickCore/option.h MagickCore/paint.c MagickCore/paint.h \ MagickCore/pixel.c MagickCore/pixel.h \ MagickCore/pixel-accessor.h MagickCore/policy.c \ @@ -4054,7 +4054,7 @@ MAGICKCORE_BASE_SRCS = \ MagickCore/morphology.h \ MagickCore/morphology-private.h \ MagickCore/nt-base.h \ - MagickCore/nt-base-private.h \ + MagickCore/nt-feature.h \ MagickCore/option.c \ MagickCore/option.h \ MagickCore/paint.c \ @@ -4285,7 +4285,8 @@ MAGICKCORE_NOINST_HDRS = \ MagickCore/module-private.h \ MagickCore/monitor-private.h \ MagickCore/morphology-private.h \ - MagickCore/nt-base-private.h \ + MagickCore/nt-base.h \ + MagickCore/nt-feature.h \ MagickCore/policy-private.h \ MagickCore/profile-private.h \ MagickCore/quantum-private.h \ @@ -4322,7 +4323,7 @@ MAGICKCORE_EXTRA_DIST = \ MagickCore/config.h_vms \ MagickCore/mac.c \ MagickCore/nt-base.c \ - MagickCore/nt-featur.c \ + MagickCore/nt-feature.c \ MagickCore/vms.c \ MagickCore/xwdfile.h_vms