summaryrefslogtreecommitdiffstats
path: root/libc/stdlib
diff options
context:
space:
mode:
authorPavel Chupin <pavel.v.chupin@intel.com>2014-03-25 13:43:04 +0400
committerCalin Juravle <calin@google.com>2014-03-28 11:15:03 +0000
commit50282f72bb9be6b49212a3978faec70786e9f97f (patch)
treefd30ad0ee980643c3f3ae923fa6d17921d15f747 /libc/stdlib
parenta58b3f78e14500e7b10fc845ef0a6a8309664663 (diff)
downloadbionic-50282f72bb9be6b49212a3978faec70786e9f97f.zip
bionic-50282f72bb9be6b49212a3978faec70786e9f97f.tar.gz
bionic-50282f72bb9be6b49212a3978faec70786e9f97f.tar.bz2
Add lconv declaration and localeconv(3)
lconv is taken from ndk/sources/android/support/include/locale.h and matches bsd/glibc upstream. Keep old declaration for 32-bits for compatibility. localeconv.c and deps are taken from openbsd upstream. Changed strtod.c accordingly. Change-Id: I9fcc4d15f5674d192950d80edf26f36006cd31b4 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/strtod.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/stdlib/strtod.c b/libc/stdlib/strtod.c
index 0a19446..b39c90e 100644
--- a/libc/stdlib/strtod.c
+++ b/libc/stdlib/strtod.c
@@ -1332,13 +1332,14 @@ strtod
Bigint *bb1, *bd0;
Bigint *bb = NULL, *bd = NULL, *bs = NULL, *delta = NULL;/* pacify gcc */
- CONST char decimal_point = '.';
-#if 0 /* BEGIN android-changed: no localeconv. */
+#if defined(__LP64__) /* BEGIN android-changed: no localeconv for ILP32. */
#ifndef KR_headers
CONST char decimal_point = localeconv()->decimal_point[0];
#else
CONST char decimal_point = '.';
#endif
+#else
+ CONST char decimal_point = '.';
#endif /* END android-changed */
sign = nz0 = nz = 0;