diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2011-04-07 19:31:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-11 10:35:25 -0700 |
| commit | 1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d (patch) | |
| tree | 980fa8b4c2a8f0adf0401f7d172697450da83e9b /merge-file.h | |
| parent | c8f1444d9e708e3994c74c180194c43bf1588b65 (diff) | |
| download | git-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.tar.gz | |
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 <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
| -rw-r--r-- | merge-file.h | 7 |
1 files changed, 7 insertions, 0 deletions
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 |