Merge branch 'js/rebase-i-tests'

diff --git a/compat/mingw.h b/compat/mingw.h
index 9a8803b876a1ed38aca34e83c3859e607bdd17e7..233933ee86b2d069c7fca5b0dc39ea6c6badb20b 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -535,7 +535,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); \