summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-07-01 15:01:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-06 08:11:47 -0700
commit08aade7080ef7955eb356c6590187be3b55dcbcd (patch)
treea3bfa54e4001651f1822fb3aab894a4ed186b7ea /compat
parentcommon-main: call git_setup_gettext() (diff)
downloadtgif-08aade7080ef7955eb356c6590187be3b55dcbcd.tar.xz
mingw: declare main()'s argv as const
In 84d32bf (sparse: Fix mingw_main() argument number/type errors, 2013-04-27), we addressed problems identified by the 'sparse' tool where argv was declared inconsistently. The way we addressed it was by casting from the non-const version to the const-version. This patch is long overdue, fixing compat/mingw.h's declaration to make the "argv" parameter const. This also allows us to lose the "const" trickery introduced earlier to common-main.c:main(). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.h2
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); \