diff options
| author | Martin Koegler <martin.koegler@chello.at> | 2017-08-16 22:16:31 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-16 21:05:01 -0700 |
| commit | 0a0948f364ab00035310242e6ed9beefc0595354 (patch) | |
| tree | 60ef6f0f9d857e09e6d7e84993f184972950d47a /combine-diff.c | |
| parent | 8b9bd2e9470ef930c3876f49341489bd594f7959 (diff) | |
| download | git-mk-dontmerge/size-t-on-next.tar.gz | |
Convert xdiff-interface to size_tmk-dontmerge/size-t-on-next
Signed-off-by: Martin Koegler <martin.koegler@chello.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index acf39ec69a..ad5d1778b7 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -343,7 +343,7 @@ struct combine_diff_state { struct sline *lost_bucket; }; -static void consume_line(void *state_, char *line, unsigned long len) +static void consume_line(void *state_, char *line, size_t len) { struct combine_diff_state *state = state_; if (5 < len && !memcmp("@@ -", line, 4)) { |