From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 14 May 2015 19:55:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1035
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98beafc4f050297cc84a5c9f5f9c93138c7900f3;p=imagemagick

---

diff --git a/MagickCore/locale.c b/MagickCore/locale.c
index 917725b83..d806f7094 100644
--- a/MagickCore/locale.c
+++ b/MagickCore/locale.c
@@ -89,10 +89,12 @@ static SemaphoreInfo
 static SplayTreeInfo
   *locale_cache = (SplayTreeInfo *) NULL;
 
-#if defined(MAGICKCORE_HAVE_LOCALE_H)
+#if !defined(MAGICKCORE_HAVE_LOCALE_T)
+typedef void *locale_t;
+#endif
+
 static volatile locale_t
   c_locale = (locale_t) NULL;
-#endif
 
 /*
   Forward declarations.
diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 475406887..9aebafa7d 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -406,6 +406,11 @@
 #define MAGICKCORE_HAVE_LOCALE_H 1
 #endif
 
+/* Define to 1 if the system has the type `locale_t'. */
+#ifndef MAGICKCORE_HAVE_LOCALE_T
+#define MAGICKCORE_HAVE_LOCALE_T 1
+#endif
+
 /* Define to 1 if you have the `localtime_r' function. */
 #ifndef MAGICKCORE_HAVE_LOCALTIME_R
 #define MAGICKCORE_HAVE_LOCALTIME_R 1
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 4f7e62849..12af1bc84 100644
--- 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  "18537:18543M"
+#define MagickSVNRevision  "18537:18545M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  0,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  0
 #define MagickppLibMinInterface  0
-#define MagickReleaseDate  "2015-05-12"
+#define MagickReleaseDate  "2015-05-14"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeLicense  \
   "http://www.imagemagick.org/script/license.php"
diff --git a/config/config.h.in b/config/config.h.in
index d3b08b1b0..a07feffad 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -269,6 +269,9 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
+/* Define to 1 if the system has the type `locale_t'. */
+#undef HAVE_LOCALE_T
+
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
diff --git a/configure b/configure
index 88f2bdc59..8064ead67 100755
--- a/configure
+++ b/configure
@@ -4333,7 +4333,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18537:18543M
+MAGICK_SVN_REVISION=18537:18545M
 
 
 # Substitute library versioning
@@ -23821,6 +23821,17 @@ $as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
   fi
 
 
+ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "$ac_includes_default"
+if test "x$ac_cv_type_locale_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_T 1
+_ACEOF
+
+
+fi
+
+
 # Float_t and double_t are intended to be the the most efficient type.
 ac_fn_c_check_type "$LINENO" "float_t" "ac_cv_type_float_t" "#include <math.h>
 "
diff --git a/configure.ac b/configure.ac
index 84e9b3f77..41b72e01c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -978,6 +978,8 @@ AC_TYPE_UINTMAX_T
 AC_TYPE_UINTPTR_T
 AC_TYPE_UNSIGNED_LONG_LONG_INT
 
+AC_CHECK_TYPES([locale_t])
+
 # Float_t and double_t are intended to be the the most efficient type.
 AC_CHECK_TYPES([float_t], [], [], [[#include <math.h>]])
 AC_CHECK_TYPES([double_t], [], [], [[#include <math.h>]])