Merge branch 'master' of github.com:cppformat/cppformat

2014-06-16 07:49:37 -07:00
parent 1f19b986a0 7d8f3c261a
commit 8666ea82f7
6 changed files with 21 additions and 6 deletions
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -35,7 +35,7 @@
 #include <memory>
 #include <sstream>

-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__MINGW32__)
 // Fix MSVC warning about "unsafe" fopen.
 FILE *FOpen(const char *filename, const char *mode) {
  FILE *f = 0;