diff options
| author | Dan Albert <danalbert@google.com> | 2022-01-07 14:38:29 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2022-01-07 14:38:29 -0800 |
| commit | 952da926708c589fc8cc8f114e196bbdc91f3f3c (patch) | |
| tree | 9a7d4270ffc931f863a7ebc21acf828588fa56db | |
| parent | e2c784f15912115f778e427f0ce9a21189a3b494 (diff) | |
Remove availability definitions for mbs APIs.
Definitions for these are provided in libandroid_support for API
levels that do not expose this in the stubs. For the rare cases where
libandroid_support is not being used this will result in a lower
quality diagnostic (undefined reference instead of "not available
until API 21"), but other fixes would also have that behavior because
the libandroid_support headers are *always* available, even if
libandroid_support won't be linked.
Test: Reverted xfailed tests for #1108 and reran tests with this
Bug: https://github.com/android/ndk/issues/1108
Change-Id: I371f5b9d7caeef8dc7c80f2f6d11280ecba119c9
| -rw-r--r-- | libc/include/stdlib.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/stdlib.h b/libc/include/stdlib.h index 252e73a91..4aa27f97b 100644 --- a/libc/include/stdlib.h +++ b/libc/include/stdlib.h @@ -161,11 +161,11 @@ const char* getprogname(void) __INTRODUCED_IN(21); void setprogname(const char* __name) __INTRODUCED_IN(21); int mblen(const char* __s, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(26); -size_t mbstowcs(wchar_t* __dst, const char* __src, size_t __n) __INTRODUCED_IN(21) __VERSIONER_NO_GUARD; +size_t mbstowcs(wchar_t* __dst, const char* __src, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21); int mbtowc(wchar_t* __wc_ptr, const char* __s, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21); int wctomb(char* __dst, wchar_t __wc) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21); -size_t wcstombs(char* __dst, const wchar_t* __src, size_t __n) __INTRODUCED_IN(21) __VERSIONER_NO_GUARD; +size_t wcstombs(char* __dst, const wchar_t* __src, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21); #if __ANDROID_API__ >= 21 size_t __ctype_get_mb_cur_max(void) __INTRODUCED_IN(21); |