(no commit message)

diff --git a/magick/nt-base.h b/magick/nt-base.h
index 938ee212f4975144f15785617891494260bac004..7fc8b253ae6a35e18fc36dbc0b7d55095c35d316 100644 (file)
--- a/magick/nt-base.h
+++ b/magick/nt-base.h
@@ -137,6 +137,9 @@ extern "C" {
 #if !defined(isatty)
 #  define isatty _isatty
 #endif
+#if !defined(locale_t)
+#define locale_t _locale_t
+#endif
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
   !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
 #  define lseek  _lseeki64
@@ -192,15 +195,11 @@ extern "C" {
 #  define popen  _popen
 #endif
 #if !defined(fprintf)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
 #define fprintf  _fprintf_s
 #endif
-#endif
 #if !defined(fprintf_l)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
 #define fprintf_l  _fprintf_s_l
 #endif
-#endif
 #if !defined(read)
 #  define read  _read
 #endif
@@ -216,6 +215,9 @@ extern "C" {
 #if !defined(spawnvp)
 #  define spawnvp  _spawnvp
 #endif
+#if !defined(strtod_l)
+#define strtod_l  _strtod_l
+#endif
 #if !defined(stat) && !defined(__BORLANDC__)
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
   !(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
@@ -245,25 +247,16 @@ extern "C" {
 #if !defined(tempnam)
 #  define tempnam  _tempnam_s
 #endif
-#if !defined(vfprintf)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
-#define vfprintf  _vfprintf_s
-#endif
-#endif
 #if !defined(vfprintf_l)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
-#define vfprintf_l  _vfprintf_s_l
-#endif
+#define vfprintf_l  _vfprintf_l
 #endif
 #if !defined(vsnprintf)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
-#define vsnprintf  _vsnprintf_s
+#if !defined(_MSC_VER) || (defined(_MSC_VER) && _MSC_VER < 1500)
+#define vsnprintf _vsnprintf 
 #endif
 #endif
 #if !defined(vsnprintf_l)
-#if !defined(_MSC_VER) || (defined(_MSC_VER) && (_MSC_VER < 1500))
-#define vsnprintf_l  _vsnprintf_s_l
-#endif
+#define vsnprintf_l  _vsnprintf_l
 #endif
 #if !defined(write)
 #  define write  _write
@@ -342,8 +335,6 @@ struct timezone
     tz_minuteswest,
     tz_dsttime;
 };
-
-typedef _locale_t locale_t;
 #endif
 
 typedef UINT

diff --git a/magick/property.h b/magick/property.h
index 50919269aff6fb3ac3a7ea65f7c13b91d4c76959..a67af02a29f6ffc10ec4a643059228b71bfa40ad 100644 (file)
--- a/magick/property.h
+++ b/magick/property.h
@@ -37,8 +37,6 @@ extern MagickExport MagickBooleanType
   DeleteImageProperty(Image *,const char *),
   FormatImageProperty(Image *,const char *,const char *,...)
     magick_attribute((format (printf,3,4))),
-  FormatImagePropertyList(Image *,const char *,const char *,va_list)
-    magick_attribute((format (printf,3,0))),
   SetImageProperty(Image *,const char *,const char *);
 
 extern MagickExport void