From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 25 Mar 2014 11:49:41 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e2b6248f4610e25dae39d5029007ce9906c6ddc;p=imagemagick

---

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 43156aef5..6bc9ebba8 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -411,8 +411,7 @@
 #define MAGICKCORE_HAVE_LOCALTIME_R 1
 #endif
 
-/* Define to 1 if the type `long double' works and has more range or precision
-   than `double'. */
+/* Define to 1 if the system has the type `long double'. */
 #ifndef MAGICKCORE_HAVE_LONG_DOUBLE
 #define MAGICKCORE_HAVE_LONG_DOUBLE 1
 #endif
@@ -1317,7 +1316,9 @@
 #endif
 
 /* The size of `long double', as computed by sizeof. */
-/* #undef SIZEOF_LONG_DOUBLE */
+#ifndef MAGICKCORE_SIZEOF_LONG_DOUBLE
+#define MAGICKCORE_SIZEOF_LONG_DOUBLE 16
+#endif
 
 /* The size of `off_t', as computed by sizeof. */
 #ifndef MAGICKCORE_SIZEOF_OFF_T
diff --git a/MagickCore/nt-base.h b/MagickCore/nt-base.h
index e15bf8e99..87ead52d3 100644
--- a/MagickCore/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -37,6 +37,7 @@ extern "C" {
 #include <io.h>
 #include <process.h>
 #include <errno.h>
+#include <malloc.h>
 #if defined(_DEBUG) && !defined(__MINGW32__) && !defined(__MINGW64__)
 #include <crtdbg.h>
 #endif
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8d08a1e59..cd31d44ef 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15198:15212M"
+#define MagickSVNRevision  "15224M"
 #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  "2014-03-24"
+#define MagickReleaseDate  "2014-03-25"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"
diff --git a/config/config.h.in b/config/config.h.in
index f1b9802b4..e49ca2a0a 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -272,8 +272,7 @@
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the type `long double' works and has more range or precision
-   than `double'. */
+/* Define to 1 if the system has the type `long double'. */
 #undef HAVE_LONG_DOUBLE
 
 /* Define to 1 if the type `long double' works and has more range or precision
diff --git a/configure b/configure
index e89cf6114..cdf617adf 100755
--- a/configure
+++ b/configure
@@ -3702,7 +3702,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15198:15212M
+MAGICK_SVN_REVISION=15224M
 
 
 # Substitute library versioning
@@ -23626,70 +23626,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-if test ${cross_compiling} = "no"; then
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long double with more range or precision than double" >&5
-$as_echo_n "checking for long double with more range or precision than double... " >&6; }
-if ${ac_cv_type_long_double_wider+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <float.h>
-	    long double const a[] =
-	      {
-		 0.0L, DBL_MIN, DBL_MAX, DBL_EPSILON,
-		 LDBL_MIN, LDBL_MAX, LDBL_EPSILON
-	      };
-	    long double
-	    f (long double x)
-	    {
-	       return ((x + (unsigned long int) 10) * (-1 / x) + a[0]
-			+ (x ? f (x) : 'c'));
-	    }
-
-int
-main ()
-{
-static int test_array [1 - 2 * !((0 < ((DBL_MAX_EXP < LDBL_MAX_EXP)
-		   + (DBL_MANT_DIG < LDBL_MANT_DIG)
-		   - (LDBL_MAX_EXP < DBL_MAX_EXP)
-		   - (LDBL_MANT_DIG < DBL_MANT_DIG)))
-	    && (int) LDBL_EPSILON == 0
-	  )];
-test_array [0] = 0;
-return test_array [0];
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_type_long_double_wider=yes
-else
-  ac_cv_type_long_double_wider=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_double_wider" >&5
-$as_echo "$ac_cv_type_long_double_wider" >&6; }
-  if test $ac_cv_type_long_double_wider = yes; then
-
-$as_echo "#define HAVE_LONG_DOUBLE_WIDER 1" >>confdefs.h
-
-  fi
-
-    ac_cv_c_long_double=$ac_cv_type_long_double_wider
-    if test $ac_cv_c_long_double = yes; then
-
-$as_echo "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
-
-    fi
-
-fi
-if test "${ac_cv_c_have_long_double}" = "yes" ; then
-  # The cast to long int works around a bug in the HP C Compiler
+# The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
@@ -23722,7 +23659,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-fi
 
 # Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
 # The cast to long int works around a bug in the HP C Compiler
diff --git a/configure.ac b/configure.ac
index 398a9eec2..a251471e3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1003,12 +1003,7 @@ AC_CHECK_SIZEOF([double_t], [], [[#include <math.h>]])
 # Get size of float, double and long double for comparaison.
 AC_CHECK_SIZEOF([float])
 AC_CHECK_SIZEOF([double])
-if test ${cross_compiling} = "no"; then
-  AC_C_LONG_DOUBLE
-fi
-if test "${ac_cv_c_have_long_double}" = "yes" ; then
-  AC_CHECK_SIZEOF([long double])
-fi
+AC_CHECK_SIZEOF([long double])
 
 # Obtain size of an 'signed short' and define as SIZEOF_SIGNED_SHORT
 AC_CHECK_SIZEOF(signed short)