Merge branch 'locale'

e9a0d314 · Victor Zverovich · c7d0241a · c7739536 · e9a0d314
Commit e9a0d314 authored Jun 15, 2016 by Victor Zverovich
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

fmt/posix.h fmt/posix.h +1 -1

No files found.
--- a/fmt/posix.h
+++ b/fmt/posix.h
@@ -339,7 +339,7 @@ class File {
 // Returns the memory page size.
 long getpagesize();

-#if defined(LC_NUMERIC_MASK) || defined(_MSC_VER)
+#if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && !defined(__ANDROID__)
 # define FMT_LOCALE
 #endif