From 1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Thu, 7 Apr 2011 19:31:24 +0100 Subject: sparse: Fix an "symbol 'merge_file' not decared" warning In order to fix the warning, we add a new "merge-file.h" header containing the extern declaration of the merge_file() function, and include the header in the source files that require the declaration. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano --- merge-file.c | 1 + 1 file changed, 1 insertion(+) (limited to 'merge-file.c') diff --git a/merge-file.c b/merge-file.c index f7f4533926..7845528e88 100644 --- a/merge-file.c +++ b/merge-file.c @@ -3,6 +3,7 @@ #include "xdiff-interface.h" #include "ll-merge.h" #include "blob.h" +#include "merge-file.h" static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) { -- cgit v1.2.1