mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparse: Fix an "symbol 'merge_file' not decared" warning

Browse Source 
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 <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramsay Jones
2011-04-07 19:31:24 +01:00
committed by Junio C Hamano
parent c8f1444d9e
commit 1e0f8c41ac
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
merge-file.h Normal file
View File

@ -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