diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 10:02:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 10:02:57 -0700 |
commit | de61cebde72a15b85b6e6a06ef4c3614b6afdac8 (patch) | |
tree | 7d0e816e7e7718a17c07b3b73b753710b879c7c5 /compat | |
parent | Git 2.9 (diff) | |
parent | mingw: declare main()'s argv as const (diff) | |
download | tgif-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.xz |
Merge branch 'jk/common-main-2.8' into jk/common-main
* jk/common-main-2.8:
mingw: declare main()'s argv as const
common-main: call git_setup_gettext()
common-main: call restore_sigpipe_to_default()
common-main: call sanitize_stdfds()
common-main: call git_extract_argv0_path()
add an extra level of indirection to main()
Diffstat (limited to 'compat')
-rw-r--r-- | compat/mingw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 69bb43dc35..1ac9086a82 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs; void mingw_startup(); #define main(c,v) dummy_decl_mingw_main(); \ 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); \ |