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.h | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 merge-file.h (limited to 'merge-file.h') diff --git a/merge-file.h b/merge-file.h new file mode 100644 index 0000000000..9b3b83ac6c --- /dev/null +++ b/merge-file.h @@ -0,0 +1,7 @@ +#ifndef MERGE_FILE_H +#define MERGE_FILE_H + +extern void *merge_file(const char *path, struct blob *base, struct blob *our, + struct blob *their, unsigned long *size); + +#endif -- cgit v1.2.3