From 38d73d6faedcb633374398384f6a03a08e73bac5 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 19 May 2011 01:55:37 +0000
Subject: [PATCH]

---
 magick/nt-base.h | 11 ++++++++---
 magick/studio.h  |  3 +++
 wand/studio.h    |  3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/magick/nt-base.h b/magick/nt-base.h
index f7c457bad..875b7e4ab 100644
--- a/magick/nt-base.h
+++ b/magick/nt-base.h
@@ -75,7 +75,7 @@ extern "C" {
 #endif
 
 #if !defined(access)
-#  define access(path,mode)  _access(path,mode)
+#  define access(path,mode)  _access_s(path,mode)
 #endif
 #if !defined(chdir)
 #  define chdir  _chdir
@@ -233,11 +233,16 @@ extern "C" {
 #  define telldir(directory)  NTTellDirectory(directory)
 #endif
 #if !defined(tempnam)
-#  define tempnam  _tempnam
+#  define tempnam  _tempnam_s
 #endif
 #if !defined(vsnprintf)
 #if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
-#define vsnprintf  _vsnprintf
+#define vsnprintf  _vsnprintf_s
+#endif
+#endif
+#if !defined(vsnprintf_l)
+#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
+#define vsnprintf_l  _vsnprintf_s_l
 #endif
 #endif
 #if !defined(write)
diff --git a/magick/studio.h b/magick/studio.h
index 5a975f01c..81c5a0654 100644
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -180,6 +180,9 @@ extern "C" {
 #include <signal.h>
 #include <assert.h>
 
+#if defined(MAGICKCORE_HAVE_XLOCALE_H)
+# include <xlocale.h>
+#endif
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 # include <pthread.h>
 #elif defined(MAGICKCORE_WINDOWS_SUPPORT)
diff --git a/wand/studio.h b/wand/studio.h
index 8ca3168bb..22793b5ff 100644
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -190,6 +190,9 @@ extern "C" {
 #include <signal.h>
 #include <assert.h>
 
+#if defined(MAGICKCORE_HAVE_XLOCALE_H)
+# include <xlocale.h>
+#endif
 #if defined(MAGICKCORE_THREAD_SUPPORT)
 # include <pthread.h>
 #elif defined(MAGICKCORE_WINDOWS_SUPPORT)
-- 
2.40.0