Merge branch 'rr/push-head'

diff --git a/compat/mingw.h b/compat/mingw.h
index 3036980ca2f83b2139b5c2895687ebd775ad5834..bd0a88bc1d19583b7dfed36fd8f7a7af7f386296 100644 (file)
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -346,8 +346,8 @@ extern CRITICAL_SECTION pinfo_cs;
  */
 
 #define main(c,v) dummy_decl_mingw_main(); \
-static int mingw_main(); \
-int main(int argc, const char **argv) \
+static int mingw_main(c,v); \
+int main(int argc, char **argv) \
 { \
        extern CRITICAL_SECTION pinfo_cs; \
        _fmode = _O_BINARY; \