summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-13 08:22:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-13 09:02:10 (GMT)
commitb79d18c92d9f4841a6a1a29b7b2373a8ff9871e1 (patch)
treed0c81d1b53c03aefe4cdad33f6c4a80ca6c290da /merge-recursive.c
parent334d28ae606c2d007803594cfc20d9e7997c0543 (diff)
downloadgit-b79d18c92d9f4841a6a1a29b7b2373a8ff9871e1.zip
git-b79d18c92d9f4841a6a1a29b7b2373a8ff9871e1.tar.gz
git-b79d18c92d9f4841a6a1a29b7b2373a8ff9871e1.tar.bz2
-Wold-style-definition fix
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 4a82b74..c8539ec 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -127,7 +127,7 @@ static void output(int v, const char *fmt, ...)
va_end(args);
}
-static void flush_output()
+static void flush_output(void)
{
struct output_buffer *b, *n;
for (b = output_list; b; b = n) {