aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2006-11-10 15:50:39 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2006-11-10 15:50:39 +0000
commitde7d36016f9976d22fdfc8487702edcc92cdd096 (patch)
tree364d6c4afe9d005e2b9beb0b1aea88274f12379d /libstdc++-v3
parentb55d87cc684aa4a332de4099ed149f26985dcae8 (diff)
* config/locale/gnu/c_locale.cc (__convert_to_v): Prefer
strtold_l over __strtold_l if available. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118654 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/config/locale/gnu/c_locale.cc6
2 files changed, 11 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e0ee3438ad0..bf13f595b5a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10 Jakub Jelinek <jakub@redhat.com>
+
+ * config/locale/gnu/c_locale.cc (__convert_to_v): Prefer
+ strtold_l over __strtold_l if available.
+
2006-11-07 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/29722
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc
index 8a42638e0f2..37db702677a 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.cc
+++ b/libstdc++-v3/config/locale/gnu/c_locale.cc
@@ -77,7 +77,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
char* __sanity;
errno = 0;
+#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
+ // Prefer strtold_l, as __strtold_l isn't prototyped in more recent
+ // glibc versions.
+ long double __ld = strtold_l(__s, &__sanity, __cloc);
+#else
long double __ld = __strtold_l(__s, &__sanity, __cloc);
+#endif
if (__sanity != __s && errno != ERANGE)
__v = __ld;
else