summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorEugene Yudin <e.yudin@ndmsystems.com>2017-07-24 22:27:00 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-07-28 19:06:07 +0200
commitb98192b80ee5654aa7c5590bcc266c5eec2c67a5 (patch)
treeb6f6dbf90cd2dadceb24b4ea8e4ea8831e79c88e /libc
parent63597398e4fa0db50638568a8caa1637bab44705 (diff)
fix tolower and locales
The function towlower doesn't work with locales different from C. Issue was introduced in commit: 8cde3a9bf2856dcb9a759dec7ecb04a68e712254 Call to setlocale is needed for correct generation of the table uplow_diff. Otherwise you receive compile time error "range assumption error" after uncommenting the call. Similar problem described here: http://lists.uclibc.org/pipermail/uclibc/2015-March/048852.html This commit fix the problem by using int32_t values.
Diffstat (limited to 'libc')
-rw-r--r--libc/misc/locale/locale.c2
-rw-r--r--libc/sysdeps/linux/common/bits/uClibc_locale.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libc/misc/locale/locale.c b/libc/misc/locale/locale.c
index e38792b51..d555f5da6 100644
--- a/libc/misc/locale/locale.c
+++ b/libc/misc/locale/locale.c
@@ -820,7 +820,7 @@ void attribute_hidden _locale_init_l(__locale_t base)
base->tblwuplow
= (const unsigned char *) &__locale_mmap->tblwuplow;
base->tblwuplow_diff
- = (const int16_t *) &__locale_mmap->tblwuplow_diff;
+ = (const int32_t *) &__locale_mmap->tblwuplow_diff;
/* base->tblwcomb */
/* = (const unsigned char *) &__locale_mmap->tblwcomb; */
/* width?? */
diff --git a/libc/sysdeps/linux/common/bits/uClibc_locale.h b/libc/sysdeps/linux/common/bits/uClibc_locale.h
index 6598eafd2..43c1e510e 100644
--- a/libc/sysdeps/linux/common/bits/uClibc_locale.h
+++ b/libc/sysdeps/linux/common/bits/uClibc_locale.h
@@ -192,7 +192,7 @@ struct __uclibc_locale_struct {
const unsigned char *tblwctype;
const unsigned char *tblwuplow;
/* const unsigned char *tblwcomb; */
- const int16_t *tblwuplow_diff; /* yes... signed */
+ const int32_t *tblwuplow_diff; /* yes... signed */
/* width?? */
wchar_t decimal_point_wc;