diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index b12daf1..b2a2e5c 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -41,6 +41,7 @@
Include declarations.
*/
#include "MagickCore/studio.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/blob.h"
#include "MagickCore/blob-private.h"
#include "MagickCore/cache.h"
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index b431cb9..2d6787e 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -54,6 +54,7 @@
#include "MagickCore/log.h"
#include "MagickCore/magick.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/pixel.h"
#include "MagickCore/pixel-accessor.h"
#include "MagickCore/policy.h"
diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index a84a5d4..7164f5a 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -50,6 +50,7 @@
#include "MagickCore/locale-private.h"
#include "MagickCore/log.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/semaphore.h"
#include "MagickCore/splay-tree.h"
#include "MagickCore/string_.h"
diff --git a/MagickCore/module.c b/MagickCore/module.c
index e72d16b..d76e094 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -54,6 +54,7 @@
#include "MagickCore/memory_.h"
#include "MagickCore/module.h"
#include "MagickCore/module-private.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/policy.h"
#include "MagickCore/semaphore.h"
#include "MagickCore/splay-tree.h"
diff --git a/MagickCore/nt-base-private.h b/MagickCore/nt-base-private.h
index 4f947e6..bc7c2f4 100644
--- a/MagickCore/nt-base-private.h
+++ b/MagickCore/nt-base-private.h
@@ -399,8 +399,6 @@
NTGatherRandomData(const size_t,unsigned char *),
NTGetExecutionPath(char *,const size_t),
NTGetModulePath(const char *,char *),
- NTIsMagickConflict(const char *),
- NTLoadTypeLists(SplayTreeInfo *,ExceptionInfo *),
NTReportEvent(const char *,const MagickBooleanType),
NTReportException(const char *,const MagickBooleanType);
diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c
index 18a3e83..aaa76ad 100644
--- a/MagickCore/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -46,6 +46,8 @@
#include "MagickCore/log.h"
#include "MagickCore/magick.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-base.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/resource_.h"
#include "MagickCore/resource-private.h"
#include "MagickCore/timer.h"
@@ -231,7 +233,7 @@
% process.
%
*/
-MagickExport int Exit(int status)
+MagickPrivate int Exit(int status)
{
if (IsWindows95())
TerminateProcess(GetCurrentProcess(),(unsigned int) status);
@@ -264,7 +266,7 @@
% o time_zone: the time zone.
%
*/
-MagickExport int gettimeofday (struct timeval *time_value,
+MagickPrivate int gettimeofday (struct timeval *time_value,
struct timezone *time_zone)
{
#define EpochFiletime MagickLLConstant(116444736000000000)
@@ -324,7 +326,7 @@
% int IsWindows95()
%
*/
-MagickExport int IsWindows95()
+MagickPrivate int IsWindows95()
{
OSVERSIONINFO
version_info;
@@ -361,7 +363,7 @@
% o argv: the wide-character command line arguments.
%
*/
-MagickExport char **NTArgvToUTF8(const int argc,wchar_t **argv)
+MagickPrivate char **NTArgvToUTF8(const int argc,wchar_t **argv)
{
char
**utf8;
@@ -418,7 +420,7 @@
% o entry: Specifies a pointer to a DIR structure.
%
*/
-MagickExport int NTCloseDirectory(DIR *entry)
+MagickPrivate int NTCloseDirectory(DIR *entry)
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(entry != (DIR *) NULL);
@@ -449,7 +451,7 @@
% o handle: Specifies a handle to a previously loaded dynamic module.
%
*/
-MagickExport int NTCloseLibrary(void *handle)
+MagickPrivate int NTCloseLibrary(void *handle)
{
if (IsWindows95())
return(FreeLibrary((HINSTANCE) handle));
@@ -483,7 +485,7 @@
return(FALSE);
}
-MagickExport int NTControlHandler(void)
+MagickPrivate int NTControlHandler(void)
{
return(SetConsoleCtrlHandler((PHANDLER_ROUTINE) ControlHandler,TRUE));
}
@@ -507,7 +509,7 @@
% double NTElapsedTime(void)
%
*/
-MagickExport double NTElapsedTime(void)
+MagickPrivate double NTElapsedTime(void)
{
union
{
@@ -554,7 +556,7 @@
% o description: Specifies any description to the reason.
%
*/
-MagickExport void NTErrorHandler(const ExceptionType severity,
+MagickPrivate void NTErrorHandler(const ExceptionType severity,
const char *reason,const char *description)
{
char
@@ -607,7 +609,7 @@
% int NTExitLibrary(void)
%
*/
-MagickExport int NTExitLibrary(void)
+MagickPrivate int NTExitLibrary(void)
{
return(0);
}
@@ -637,7 +639,7 @@
% random: the random data is returned here.
%
*/
-MagickExport MagickBooleanType NTGatherRandomData(const size_t length,
+MagickPrivate MagickBooleanType NTGatherRandomData(const size_t length,
unsigned char *random)
{
#if defined(MAGICKCORE_CIPHER_SUPPORT) && defined(_MSC_VER) && (_MSC_VER > 1200)
@@ -695,7 +697,7 @@
% o extent: the maximum extent of the path.
%
*/
-MagickExport MagickBooleanType NTGetExecutionPath(char *path,
+MagickPrivate MagickBooleanType NTGetExecutionPath(char *path,
const size_t extent)
{
GetModuleFileName(0,path,(DWORD) extent);
@@ -764,7 +766,7 @@
% const char *NTGetLibraryError(void)
%
*/
-MagickExport const char *NTGetLibraryError(void)
+MagickPrivate const char *NTGetLibraryError(void)
{
static char
last_error[MaxTextExtent];
@@ -840,7 +842,7 @@
% path: the module path is returned here.
%
*/
-MagickExport MagickBooleanType NTGetModulePath(const char *module,char *path)
+MagickPrivate MagickBooleanType NTGetModulePath(const char *module,char *path)
{
char
module_path[MaxTextExtent];
@@ -1101,7 +1103,7 @@
return(FALSE);
}
-MagickExport int NTGhostscriptDLL(char *path,int length)
+MagickPrivate int NTGhostscriptDLL(char *path,int length)
{
static char
dll[MaxTextExtent] = { "" };
@@ -1146,7 +1148,7 @@
% const GhostInfo *NTGhostscriptDLLVectors(void)
%
*/
-MagickExport const GhostInfo *NTGhostscriptDLLVectors(void)
+MagickPrivate const GhostInfo *NTGhostscriptDLLVectors(void)
{
if (NTGhostscriptLoadDLL() == FALSE)
return((GhostInfo *) NULL);
@@ -1179,7 +1181,7 @@
% o length: length of buffer.
%
*/
-MagickExport int NTGhostscriptEXE(char *path,int length)
+MagickPrivate int NTGhostscriptEXE(char *path,int length)
{
register char
*p;
@@ -1230,7 +1232,7 @@
% o length: length of the path buffer.
%
*/
-MagickExport int NTGhostscriptFonts(char *path,int length)
+MagickPrivate int NTGhostscriptFonts(char *path,int length)
{
char
buffer[MaxTextExtent],
@@ -1276,7 +1278,7 @@
% int NTGhostscriptLoadDLL(void)
%
*/
-MagickExport int NTGhostscriptLoadDLL(void)
+MagickPrivate int NTGhostscriptLoadDLL(void)
{
char
path[MaxTextExtent];
@@ -1325,7 +1327,7 @@
% int NTGhostscriptUnLoadDLL(void)
%
*/
-MagickExport int NTGhostscriptUnLoadDLL(void)
+MagickPrivate int NTGhostscriptUnLoadDLL(void)
{
int
status;
@@ -1356,7 +1358,7 @@
% int NTInitializeLibrary(void)
%
*/
-MagickExport int NTInitializeLibrary(void)
+MagickPrivate int NTInitializeLibrary(void)
{
return(0);
}
@@ -1376,11 +1378,11 @@
%
% The format of the NTMapMemory method is:
%
-% MagickExport void *NTMapMemory(char *address,size_t length,int protection,
+% MagickPrivate void *NTMapMemory(char *address,size_t length,int protection,
% int access,int file,MagickOffsetType offset)
%
*/
-MagickExport void *NTMapMemory(char *address,size_t length,int protection,
+MagickPrivate void *NTMapMemory(char *address,size_t length,int protection,
int flags,int file,MagickOffsetType offset)
{
DWORD
@@ -1465,7 +1467,7 @@
% o entry: Specifies a pointer to a DIR structure.
%
*/
-MagickExport DIR *NTOpenDirectory(const char *path)
+MagickPrivate DIR *NTOpenDirectory(const char *path)
{
char
file_specification[MaxTextExtent];
@@ -1542,7 +1544,7 @@
#endif
}
-MagickExport void *NTOpenLibrary(const char *filename)
+MagickPrivate void *NTOpenLibrary(const char *filename)
{
#define MaxPathElements 31
@@ -1623,7 +1625,7 @@
% o entry: Specifies a pointer to a DIR structure.
%
*/
-MagickExport struct dirent *NTReadDirectory(DIR *entry)
+MagickPrivate struct dirent *NTReadDirectory(DIR *entry)
{
int
status;
@@ -1680,7 +1682,7 @@
% "LibPath", "CoderModulesPath", "FilterModulesPath", "SharePath".
%
*/
-MagickExport unsigned char *NTRegistryKeyLookup(const char *subkey)
+MagickPrivate unsigned char *NTRegistryKeyLookup(const char *subkey)
{
char
package_key[MaxTextExtent];
@@ -1767,7 +1769,7 @@
% o error: MagickTrue the event is an error.
%
*/
-MagickExport MagickBooleanType NTReportEvent(const char *event,
+MagickPrivate MagickBooleanType NTReportEvent(const char *event,
const MagickBooleanType error)
{
const char
@@ -1814,7 +1816,7 @@
% o id: Specifies a string that identifies the resource.
%
*/
-MagickExport unsigned char *NTResourceToBlob(const char *id)
+MagickPrivate unsigned char *NTResourceToBlob(const char *id)
{
char
path[MaxTextExtent];
@@ -1896,7 +1898,7 @@
% stream.
%
*/
-MagickExport void NTSeekDirectory(DIR *entry,ssize_t position)
+MagickPrivate void NTSeekDirectory(DIR *entry,ssize_t position)
{
(void) position;
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -1927,7 +1929,7 @@
% for DLL's that can be dynamically loaded.
%
*/
-MagickExport int NTSetSearchPath(const char *path)
+MagickPrivate int NTSetSearchPath(const char *path)
{
#if defined(MAGICKCORE_LTDL_DELEGATE)
lt_dlsetsearchpath(path);
@@ -1966,7 +1968,7 @@
% o flags: Option flags (ignored for Windows).
%
*/
-MagickExport int NTSyncMemory(void *address,size_t length,int flags)
+MagickPrivate int NTSyncMemory(void *address,size_t length,int flags)
{
(void) flags;
if (FlushViewOfFile(address,length) == MagickFalse)
@@ -1997,7 +1999,7 @@
% o command: This string is the command to execute.
%
*/
-MagickExport int NTSystemCommand(const char *command)
+MagickPrivate int NTSystemCommand(const char *command)
{
char
local_command[MaxTextExtent];
@@ -2073,7 +2075,7 @@
% o name: _SC_PAGE_SIZE or _SC_PHYS_PAGES.
%
*/
-MagickExport ssize_t NTSystemConfiguration(int name)
+MagickPrivate ssize_t NTSystemConfiguration(int name)
{
switch (name)
{
@@ -2148,7 +2150,7 @@
% o entry: Specifies a pointer to a DIR structure.
%
*/
-MagickExport ssize_t NTTellDirectory(DIR *entry)
+MagickPrivate ssize_t NTTellDirectory(DIR *entry)
{
assert(entry != (DIR *) NULL);
return(0);
@@ -2178,7 +2180,7 @@
% o length: the file length.
%
*/
-MagickExport int NTTruncateFile(int file,off_t length)
+MagickPrivate int NTTruncateFile(int file,off_t length)
{
DWORD
file_pointer;
@@ -2225,7 +2227,7 @@
% o length: the length of the binary large object.
%
*/
-MagickExport int NTUnmapMemory(void *map,size_t length)
+MagickPrivate int NTUnmapMemory(void *map,size_t length)
{
(void) length;
if (UnmapViewOfFile(map) == 0)
@@ -2252,7 +2254,7 @@
% double NTUserTime(void)
%
*/
-MagickExport double NTUserTime(void)
+MagickPrivate double NTUserTime(void)
{
DWORD
status;
@@ -2321,7 +2323,7 @@
% o description: Specifies any description to the reason.
%
*/
-MagickExport void NTWarningHandler(const ExceptionType severity,
+MagickPrivate void NTWarningHandler(const ExceptionType severity,
const char *reason,const char *description)
{
char
diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index 845a67b..f1f977e 100644
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -55,6 +55,8 @@
#include "MagickCore/memory_.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
+#include "MagickCore/nt-base.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/pixel-accessor.h"
#include "MagickCore/quantum.h"
#include "MagickCore/string_.h"
diff --git a/MagickCore/string.c b/MagickCore/string.c
index 71856b4..fc9bb57 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -48,6 +48,7 @@
#include "MagickCore/locale_.h"
#include "MagickCore/log.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-base-private.h"
#include "MagickCore/property.h"
#include "MagickCore/resource_.h"
#include "MagickCore/signature-private.h"
diff --git a/MagickCore/type.c b/MagickCore/type.c
index 4be0371..6699e98 100644
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -49,6 +49,7 @@
#include "MagickCore/hashmap.h"
#include "MagickCore/log.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/nt-feature.h"
#include "MagickCore/nt-base-private.h"
#include "MagickCore/option.h"
#include "MagickCore/semaphore.h"
diff --git a/MagickCore/utility-private.h b/MagickCore/utility-private.h
index 5afc1cd..df0160d 100644
--- a/MagickCore/utility-private.h
+++ b/MagickCore/utility-private.h
@@ -24,6 +24,7 @@
#include "MagickCore/memory_.h"
#include "MagickCore/nt-base.h"
+#include "MagickCore/nt-base-private.h"
extern MagickPrivate char
**GetPathComponents(const char *,size_t *),