Merge branch 'master' into update-project-layout

Conflicts: posix.h
2016-02-03 13:15:26 +01:00
parent 03b9485cb3 cfb25b0e80
commit 3133925ab2
3 changed files with 117 additions and 4 deletions
@@ -388,7 +388,7 @@ TEST(FileTest, FdopenError) {
      f.fdopen("r"), EBADF, "cannot associate stream with file descriptor");
 }

-#ifdef LC_NUMERIC_MASK
+#ifdef FMT_LOCALE
 TEST(LocaleTest, Strtod) {
  fmt::Locale locale;
  const char *start = "4.2", *ptr = start;