From 5c262507c73cdc180823514849823f7748a353cc Mon Sep 17 00:00:00 2001
From: Magnus Bjerke Vik <mbvett@gmail.com>
Date: Thu, 19 Jan 2017 20:26:35 +0100
Subject: [PATCH] Fix Android not being detected with latest NDK toolchain

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 c5de6921..fc031f2e 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -2916,7 +2916,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>(