From bc6af7548b4202f3c188282a6020b8365252af85 Mon Sep 17 00:00:00 2001
From: Magnus Bjerke Vik <mbvett@gmail.com>
Date: Fri, 20 Jan 2017 11:20:43 +0100
Subject: [PATCH] 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.
---
 fmt/format.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fmt/format.h b/fmt/format.h
index db8e79ceea01..1f5fa26b0f73 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -2924,7 +2924,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>(