Fix Android not being detected with latest NDK toolchain (#458)

When using the NDK 13b toolchain standalone or with CMake, ANDROID is not defined,
but __ANDROID__ is defined instead.
This commit is contained in:
Magnus Bjerke Vik 2017-01-20 11:20:43 +01:00 committed by Jonathan Müller
parent 67662702aa
commit bc6af7548b

View File

@ -2924,7 +2924,7 @@ void BasicWriter<Char>::write_int(T value, Spec spec) {
case 'n': { case 'n': {
unsigned num_digits = internal::count_digits(abs_value); unsigned num_digits = internal::count_digits(abs_value);
fmt::StringRef sep = ""; fmt::StringRef sep = "";
#ifndef ANDROID #if !(defined(ANDROID) || defined(__ANDROID__))
sep = internal::thousands_sep(std::localeconv()); sep = internal::thousands_sep(std::localeconv());
#endif #endif
unsigned size = static_cast<unsigned>( unsigned size = static_cast<unsigned>(