generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 49af4264: am 0d4ccee3: Merge "Change name of MB_CUR_MAX implementation function."

Browse Source 
* commit '49af4264ab57618f5e189287f4f2aa9f8aae2231':
  Change name of MB_CUR_MAX implementation function.
This commit is contained in:
Dan Albert 2014-08-14 21:35:56 +00:00 committed by Android Git Automerger
commit db4b9e600e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/bionic/locale.cpp
View File

@ -92,7 +92,7 @@ static void __locale_init() {
g_locale.int_n_sign_posn = CHAR_MAX;
}
size_t __mb_cur_max() {
size_t __ctype_get_mb_cur_max() {
locale_t l = reinterpret_cast<locale_t>(pthread_getspecific(g_uselocale_key));
if (l == nullptr || l == LC_GLOBAL_LOCALE) {
return __bionic_current_locale_is_utf8 ? 4 : 1;

4
libc/include/stdlib.h
View File

@ -161,8 +161,8 @@ extern int mbtowc(wchar_t *, const char *, size_t);
extern int wctomb(char *, wchar_t);
extern size_t wcstombs(char *, const wchar_t *, size_t);
extern size_t __mb_cur_max(void);
#define MB_CUR_MAX __mb_cur_max()
extern size_t __ctype_get_mb_cur_max(void);
#define MB_CUR_MAX __ctype_get_mb_cur_max()
__END_DECLS