components/imagemagick/patches/uselocale.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 07 Jan 2016 12:36:58 -0800
changeset 5242 d5e2c756f63c
parent 2144 96440b7aa33e
permissions -rw-r--r--
backout 22324675 - needs more work

This patch has been submitted upstream:
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26362

--- ImageMagick-6.8.3/magick/locale.c.orig	2012-12-07 05:14:16.000000000 -0800
+++ ImageMagick-6.8.3/magick/locale.c	2014-10-09 13:32:28.333380432 -0700
@@ -256,7 +256,7 @@
 #endif
   }
 #else
-#if defined(MAGICKCORE_HAVE_USELOCALE)
+#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
   {
     locale_t
       locale,
@@ -347,7 +347,7 @@
 #endif
   }
 #elif defined(MAGICKCORE_HAVE_VSNPRINTF)
-#if defined(MAGICKCORE_HAVE_USELOCALE)
+#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L)
   {
     locale_t
       locale,