Merge tag 'v0.20.17'

release v0.20.17
This commit is contained in:
Max Kellermann
2018-02-11 13:22:43 +01:00
21 changed files with 150 additions and 24 deletions

View File

@@ -78,7 +78,12 @@ ParseDouble(const char *p, char **endptr=nullptr)
static inline float
ParseFloat(const char *p, char **endptr=nullptr)
{
#if defined(__BIONIC__) && __ANDROID_API__ < 21
/* strtof() requires API level 21 */
return (float)ParseDouble(p, endptr);
#else
return strtof(p, endptr);
#endif
}
#endif