| author | Rich Burridge <rich.burridge@oracle.com> |
| Wed, 28 Oct 2015 12:22:49 -0700 | |
| changeset 5023 | 93fb5351ff40 |
| parent 2144 | 96440b7aa33e |
| permissions | -rw-r--r-- |
|
2144
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
This patch has been submitted upstream: |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26362 |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
|
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
--- ImageMagick-6.8.3/magick/locale.c.orig 2012-12-07 05:14:16.000000000 -0800 |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
+++ ImageMagick-6.8.3/magick/locale.c 2014-10-09 13:32:28.333380432 -0700 |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
@@ -256,7 +256,7 @@ |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
#endif |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
} |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
#else |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
-#if defined(MAGICKCORE_HAVE_USELOCALE) |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
+#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L) |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
{
|
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
locale_t |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
locale, |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
@@ -347,7 +347,7 @@ |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
#endif |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
} |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
#elif defined(MAGICKCORE_HAVE_VSNPRINTF) |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
-#if defined(MAGICKCORE_HAVE_USELOCALE) |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
+#if defined(MAGICKCORE_HAVE_USELOCALE) && defined(MAGICKCORE_HAVE_STRTOD_L) |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
{
|
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
locale_t |
|
96440b7aa33e
19782835 imagemagick doesn't build on s12_58
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
locale, |