Merge "Remove __INTRODUCED_IN_NO_GUARD_FOR_NDK(21)." am: 833ad6ee51
am: a43db276fd
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2631630 Change-Id: Idae9768625f9a28d59ac09dc6a142a9ab7a8e41d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
36b4ebdecf
2 changed files with 5 additions and 5 deletions
|
@ -96,7 +96,7 @@ struct lconv {
|
|||
char int_n_sign_posn;
|
||||
};
|
||||
|
||||
struct lconv* _Nonnull localeconv(void) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21);
|
||||
struct lconv* _Nonnull localeconv(void);
|
||||
|
||||
locale_t _Nullable duplocale(locale_t _Nonnull __l);
|
||||
void freelocale(locale_t _Nonnull __l);
|
||||
|
|
|
@ -157,11 +157,11 @@ const char* _Nullable getprogname(void);
|
|||
void setprogname(const char* _Nonnull __name);
|
||||
|
||||
int mblen(const char* _Nullable __s, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(26);
|
||||
size_t mbstowcs(wchar_t* _Nullable __dst, const char* _Nullable __src, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21);
|
||||
int mbtowc(wchar_t* _Nullable __wc_ptr, const char* _Nullable __s, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21);
|
||||
int wctomb(char* _Nullable __dst, wchar_t __wc) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21);
|
||||
size_t mbstowcs(wchar_t* _Nullable __dst, const char* _Nullable __src, size_t __n);
|
||||
int mbtowc(wchar_t* _Nullable __wc_ptr, const char* _Nullable __s, size_t __n);
|
||||
int wctomb(char* _Nullable __dst, wchar_t __wc);
|
||||
|
||||
size_t wcstombs(char* _Nullable __dst, const wchar_t* _Nullable __src, size_t __n) __INTRODUCED_IN_NO_GUARD_FOR_NDK(21);
|
||||
size_t wcstombs(char* _Nullable __dst, const wchar_t* _Nullable __src, size_t __n);
|
||||
|
||||
size_t __ctype_get_mb_cur_max(void);
|
||||
#define MB_CUR_MAX __ctype_get_mb_cur_max()
|
||||
|
|
Loading…
Reference in a new issue