Merge branch 'jk/submodule-c-credential'

diff --git a/compat/mingw.h b/compat/mingw.h
index c008694639a654e6a04e541af70e90a5fa4da9e0..1de70ffd62a63070ca79d27ad0b323dfbcacb5aa 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -406,7 +406,7 @@ static inline void convert_slashes(char *path)
 int mingw_offset_1st_component(const char *path);
 #define offset_1st_component mingw_offset_1st_component
 #define PATH_SEP ';'
-#ifndef __MINGW64_VERSION_MAJOR
+#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
 #define PRIuMAX "I64u"
 #define PRId64 "I64d"
 #else