Merge branch 'ew/send-email-drop-data-dumper' into maint

diff --git a/compat/mingw.h b/compat/mingw.h
index 8c5bf5076bfe25ce5b12235c035cff95a4900f2c..1de70ffd62a63070ca79d27ad0b323dfbcacb5aa 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -396,11 +396,17 @@ static inline char *mingw_find_last_dir_sep(const char *path)
                        ret = (char *)path;
        return ret;
 }
+static inline void convert_slashes(char *path)
+{
+       for (; *path; path++)
+               if (*path == '\\')
+                       *path = '/';
+}
 #define find_last_dir_sep mingw_find_last_dir_sep
 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