Merge branch 'locale'

This commit is contained in:
Victor Zverovich
2016-06-15 15:04:24 -07:00

View File

@ -339,7 +339,7 @@ class File {
// Returns the memory page size. // Returns the memory page size.
long getpagesize(); long getpagesize();
#if defined(LC_NUMERIC_MASK) || defined(_MSC_VER) #if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && !defined(__ANDROID__)
# define FMT_LOCALE # define FMT_LOCALE
#endif #endif