diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:24:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 14:24:02 -0700 |
| commit | 7e2d574c37c6d53f09ceeb650f7af001aa50e987 (patch) | |
| tree | a68235d36ae82d5401b93ccc2a84c92acaf29cf3 /fast-import.c | |
| parent | 2f1ef15070a8664d3194d164f20283d78571e51c (diff) | |
| parent | 84d32bf7678259c08406571cd6ce4b7a6724dcba (diff) | |
| download | git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.gz git-7e2d574c37c6d53f09ceeb650f7af001aa50e987.tar.xz | |
Merge branch 'rj/sparse'
* rj/sparse:
sparse: Fix mingw_main() argument number/type errors
compat/mingw.c: Fix some sparse warnings
compat/win32mmap.c: Fix some sparse warnings
compat/poll/poll.c: Fix a sparse warning
compat/win32/pthread.c: Fix a sparse warning
compat/unsetenv.c: Fix a sparse warning
compat/nedmalloc: Fix compiler warnings on linux
compat/nedmalloc: Fix some sparse warnings
compat/fnmatch/fnmatch.c: Fix a sparse error
compat/regex/regexec.c: Fix some sparse warnings
Diffstat (limited to 'fast-import.c')
| -rw-r--r-- | fast-import.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c index 5f539d7d8..6d9445302 100644 --- a/fast-import.c +++ b/fast-import.c @@ -297,7 +297,7 @@ static int failure; static FILE *pack_edges; static unsigned int show_stats = 1; static int global_argc; -static const char **global_argv; +static char **global_argv; /* Memory pools */ static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); @@ -3347,7 +3347,7 @@ static void parse_argv(void) read_marks(); } -int main(int argc, const char **argv) +int main(int argc, char **argv) { unsigned int i; |