diff options
| -rw-r--r-- | libcxx/include/__locale | 6 | ||||
| -rw-r--r-- | libcxx/include/support/android/locale_bionic.h | 37 |
2 files changed, 38 insertions, 5 deletions
diff --git a/libcxx/include/__locale b/libcxx/include/__locale index 601f0d1ec32..c293b81fbbe 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -24,11 +24,7 @@ #elif defined(_AIX) # include <support/ibm/xlocale.h> #elif defined(__ANDROID__) -// Android gained the locale aware functions in L (API level 21) -# include <android/api-level.h> -# if __ANDROID_API__ <= 20 -# include <support/android/locale_bionic.h> -# endif +# include <support/android/locale_bionic.h> #elif defined(__sun__) # include <xlocale.h> # include <support/solaris/xlocale.h> diff --git a/libcxx/include/support/android/locale_bionic.h b/libcxx/include/support/android/locale_bionic.h index 081035d45d3..796b8d8271d 100644 --- a/libcxx/include/support/android/locale_bionic.h +++ b/libcxx/include/support/android/locale_bionic.h @@ -24,7 +24,44 @@ extern "C" { } #endif +#if defined(__ANDROID__) + +#include <android/api-level.h> + +// Android gained most locale aware functions in L (API level 21) +#if __ANDROID_API__ < 21 #include <support/xlocale/__posix_l_fallback.h> +#endif + +// The strto* family was added in O (API Level 26) +#if __ANDROID_API__ < 26 + +#if defined(__cplusplus) +extern "C" { +#endif + +inline _LIBCPP_ALWAYS_INLINE float strtof_l(const char* __nptr, char** __endptr, + locale_t) { + return ::strtof(__nptr, __endptr); +} + +inline _LIBCPP_ALWAYS_INLINE double strtod_l(const char* __nptr, + char** __endptr, locale_t) { + return ::strtod(__nptr, __endptr); +} + +inline _LIBCPP_ALWAYS_INLINE long strtol_l(const char* __nptr, char** __endptr, + int __base, locale_t) { + return ::strtol(__nptr, __endptr, __base); +} + +#if defined(__cplusplus) +} +#endif + +#endif // __ANDROID_API__ < 26 + +#endif // defined(__ANDROID__) #endif // defined(__BIONIC__) #endif // _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H |
