| commit | 1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d | |
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | |
| Thu, 7 Apr 2011 18:31:24 +0000 (7 19:31 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 11 Apr 2011 17:35:25 +0000 (11 10:35 -0700) | ||
| tree | 980fa8b4c2a8f0adf0401f7d172697450da83e9b | treesnapshot (tar.gz zip) |
| parent | c8f1444d9e708e3994c74c180194c43bf1588b65 | commitdiff |
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>
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>
| Makefile | diffblobblamehistory | |
| builtin/merge-tree.c | diffblobblamehistory | |
| merge-file.c | diffblobblamehistory | |
| merge-file.h | [new file with mode: 0644] | blob |