equal
deleted
inserted
replaced
|
1 This patch has been submitted upstream: |
|
2 http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26362 |
|
3 |
|
4 --- ImageMagick-6.8.3/magick/locale.c.orig 2012-12-07 05:14:16.000000000 -0800 |
|
5 +++ ImageMagick-6.8.3/magick/locale.c 2014-10-09 13:32:28.333380432 -0700 |
|
6 @@ -256,7 +256,7 @@ |
|
7 #endif |
|
8 } |
|
9 #else |
|
10 -#if defined(MAGICKCORE_HAVE_USELOCALE) |
|
11 +#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L) |
|
12 { |
|
13 locale_t |
|
14 locale, |
|
15 @@ -347,7 +347,7 @@ |
|
16 #endif |
|
17 } |
|
18 #elif defined(MAGICKCORE_HAVE_VSNPRINTF) |
|
19 -#if defined(MAGICKCORE_HAVE_USELOCALE) |
|
20 +#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L) |
|
21 { |
|
22 locale_t |
|
23 locale, |