diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-15 01:14:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-14 19:49:28 +0000 |
| commit | e2050ae1aa9d7e8e6f425bbb7a3991fe612f3913 (patch) | |
| tree | a2f69cd4bfff27016a7928ad5ad949995b38bdcc /libc | |
| parent | 553c0ea52bde59800fda2ddd380dd18d4f3ab192 (diff) | |
| parent | bafee43161b9e38ca6c941eb3646df20ec6da759 (diff) | |
| download | bionic-e2050ae1aa9d7e8e6f425bbb7a3991fe612f3913.zip bionic-e2050ae1aa9d7e8e6f425bbb7a3991fe612f3913.tar.gz bionic-e2050ae1aa9d7e8e6f425bbb7a3991fe612f3913.tar.bz2 | |
Merge "Change name of MB_CUR_MAX implementation function." into lmp-dev
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/bionic/locale.cpp | 2 | ||||
| -rw-r--r-- | libc/include/stdlib.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libc/bionic/locale.cpp b/libc/bionic/locale.cpp index 4c3fd7f..ddb49ce 100644 --- a/libc/bionic/locale.cpp +++ b/libc/bionic/locale.cpp @@ -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; diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index a5eb3d1..52f71dd 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -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 |