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.

(cherry picked from commit bc6af7548b)
This commit is contained in:
Magnus Bjerke Vik
2017-01-20 11:20:43 +01:00
committed by Jonathan Müller
parent 0e5a4422c2
commit 0bed09caaf

View File

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