[PATCH] diff: mark a file-local symbol static
From: Ramsay Jones <hidden>
Date: 2016-08-24 15:27:34
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Ramsay Jones <redacted> --- Hi Michael, If you need to re-roll your 'mh/diff-indent-heuristic' branch, could you please squash this into the relevant patch (commit 8f5cc189, "diff: improve positioning of add/delete blocks in diffs", 22-08-2016). Thanks! ATB, Ramsay Jones xdiff/xdiffi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index dc79628..67c1ccc 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c@@ -684,7 +684,7 @@ static void score_add_split(const struct split_measurement *m, struct split_scor } } -int score_cmp(struct split_score *s1, struct split_score *s2) +static int score_cmp(struct split_score *s1, struct split_score *s2) { /* -1 if s1.effective_indent < s2->effective_indent, etc. */ int cmp_indents = ((s1->effective_indent > s2->effective_indent) -
--
2.9.0