(no commit message)

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 48bcdfb2b59b125aa7c201c16bd99f22f522caa7..c2aa14b9de9a47b086cf7d0c7ca739e5fe8eb7a6 100644 (file)
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -68,14 +68,6 @@
 #define LocaleFilename  "locale.xml"
 #define MaxRecursionDepth  200
 \f
-/*
-  Typedef declarations.
-*/
-#if defined(__CYGWIN__)
-typedef struct _locale_t
-  *locale_t;
-#endif
-\f
 /*
   Static declarations.
 */
@@ -97,7 +89,7 @@ static SemaphoreInfo
 static SplayTreeInfo
   *locale_cache = (SplayTreeInfo *) NULL;
 
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H)
 static volatile locale_t
   c_locale = (locale_t) NULL;
 #endif
@@ -110,7 +102,7 @@ static MagickBooleanType
   LoadLocaleCache(SplayTreeInfo *,const char *,const char *,const char *,
     const size_t,ExceptionInfo *);
 \f
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -240,7 +232,7 @@ static SplayTreeInfo *AcquireLocaleSplayTree(const char *filename,
   return(locale_cache);
 }
 \f
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H)
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -342,7 +334,7 @@ MagickPrivate ssize_t FormatLocaleFileList(FILE *file,
   ssize_t
     n;
 
-#if defined(MAGICKCORE_HAVE_VFPRINTF_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H) && defined(MAGICKCORE_HAVE_VFPRINTF_L)
   {
     locale_t
       locale;
@@ -358,7 +350,7 @@ MagickPrivate ssize_t FormatLocaleFileList(FILE *file,
 #endif
   }
 #else
-#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H) && defined(MAGICKCORE_HAVE_USELOCALE)
   {
     locale_t
       locale,
@@ -433,7 +425,7 @@ MagickPrivate ssize_t FormatLocaleStringList(char *restrict string,
   ssize_t
     n;
 
-#if defined(MAGICKCORE_HAVE_VSNPRINTF_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H) && defined(MAGICKCORE_HAVE_VSNPRINTF_L)
   {
     locale_t
       locale;
@@ -449,7 +441,7 @@ MagickPrivate ssize_t FormatLocaleStringList(char *restrict string,
 #endif
   }
 #elif defined(MAGICKCORE_HAVE_VSNPRINTF)
-#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H) && defined(MAGICKCORE_HAVE_USELOCALE)
   {
     locale_t
       locale,
@@ -685,8 +677,8 @@ static int LocaleTagCompare(const void *x,const void *y)
 }
 #endif
 
-MagickExport char **GetLocaleList(const char *pattern,
-  size_t *number_messages,ExceptionInfo *exception)
+MagickExport char **GetLocaleList(const char *pattern,size_t *number_messages,
+  ExceptionInfo *exception)
 {
   char
     **messages;
@@ -992,7 +984,7 @@ MagickExport double InterpretLocaleValue(const char *restrict string,
     value=(double) strtoul(string,&q,16);
   else
     {
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H) && defined(MAGICKCORE_HAVE_STRTOD_L)
       locale_t
         locale;
 
@@ -1429,7 +1421,7 @@ MagickPrivate void LocaleComponentTerminus(void)
   LockSemaphoreInfo(locale_semaphore);
   if (locale_cache != (SplayTreeInfo *) NULL)
     locale_cache=DestroySplayTree(locale_cache);
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_HAVE_LOCALE_H)
   DestroyCLocale();
 #endif
   UnlockSemaphoreInfo(locale_semaphore);

diff --git a/MagickCore/version.h b/MagickCore/version.h
index a938734373cb21cddc5225ea13c58488e64d5aa3..76e32190bd8f59535bf9d170519bddbc51ff187a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision  "18354:18359"
+#define MagickSVNRevision  "18392M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2015-04-08"
+#define MagickReleaseDate  "2015-04-14"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \
   "http://www.imagemagick.org/script/license.php"

diff --git a/configure b/configure
index 7fcb1b51b71cd381697de1ee597cc8e51135f081..7547943ebd66fe80b6578d2e556c0ca8174fbe29 100755 (executable)
--- a/configure
+++ b/configure
@@ -4322,7 +4322,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18354:18359
+MAGICK_SVN_REVISION=18392M
 
 
 # Substitute library versioning