From 708922a1e589b59492885a2c3e304462b3a31b41 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 17 May 2015 02:33:56 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 ++-- configure | 5 +++-- configure.ac | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 12af1bc84..ebbe911c2 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:18545M" +#define MagickSVNRevision "18557:18563M" #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-14" +#define MagickReleaseDate "2015-05-16" #define MagickChangeDate "20120427" #define MagickAuthoritativeLicense \ "http://www.imagemagick.org/script/license.php" diff --git a/configure b/configure index 8064ead67..f0006780d 100755 --- a/configure +++ b/configure @@ -4333,7 +4333,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=18537:18545M +MAGICK_SVN_REVISION=18557:18563M # Substitute library versioning @@ -23821,7 +23821,8 @@ $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" +ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "#include +" if test "x$ac_cv_type_locale_t" = xyes; then : cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 41b72e01c..770a6ac97 100755 --- a/configure.ac +++ b/configure.ac @@ -978,7 +978,7 @@ AC_TYPE_UINTMAX_T AC_TYPE_UINTPTR_T AC_TYPE_UNSIGNED_LONG_LONG_INT -AC_CHECK_TYPES([locale_t]) +AC_CHECK_TYPES([locale_t], [], [], [[#include ]]) # Float_t and double_t are intended to be the the most efficient type. AC_CHECK_TYPES([float_t], [], [], [[#include ]]) -- 2.40.0