Merge branch 'sb/submodule-clone-retry'

diff --git a/compat/mingw.h b/compat/mingw.h
index ef22cbb05d140a210bd348ea1234fc60cdf09da8..95e128fcfd45e98c091256265c7d9bda95ec733f 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -538,7 +538,7 @@ extern CRITICAL_SECTION pinfo_cs;
 void mingw_startup(void);
 #define main(c,v) dummy_decl_mingw_main(void); \
 static int mingw_main(c,v); \
-int main(int argc, char **argv) \
+int main(int argc, const char **argv) \
 { \
        mingw_startup(); \
        return mingw_main(__argc, (void *)__argv); \