detect close failure on just-written file handles

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 4a82b741ae020376ac67b34d5fce86e8a87a3b5d..c8539ec0bafce5e238d97d6397a9d08c2c92a09c 100644 (file)
--- 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) {