diff options
| author | Dan Albert <danalbert@google.com> | 2014-08-14 21:19:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-14 19:41:13 +0000 |
| commit | 0d4ccee35101c6bcd6cc28c23fe79d7b48a98dd0 (patch) | |
| tree | 1249c631a5be89488538f3d9d2d0641d1cf5fbe8 | |
| parent | 104a472958f86eafafe0c1d9e2c58ba6403f99e7 (diff) | |
| parent | 224ff048efc782bd60047a3ae53eb66941f73125 (diff) | |
| download | android_bionic-0d4ccee35101c6bcd6cc28c23fe79d7b48a98dd0.tar.gz android_bionic-0d4ccee35101c6bcd6cc28c23fe79d7b48a98dd0.tar.bz2 android_bionic-0d4ccee35101c6bcd6cc28c23fe79d7b48a98dd0.zip | |
Merge "Change name of MB_CUR_MAX implementation function."
| -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 4c3fd7f31..ddb49ce6f 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 a5eb3d15b..52f71dd47 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 |