summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-04-07 18:31:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-11 17:35:25 (GMT)
commit1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d (patch)
tree980fa8b4c2a8f0adf0401f7d172697450da83e9b /Makefile
parentc8f1444d9e708e3994c74c180194c43bf1588b65 (diff)
downloadgit-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.zip
git-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.tar.gz
git-1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d.tar.bz2
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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a21f60e..385193a 100644
--- a/Makefile
+++ b/Makefile
@@ -525,6 +525,7 @@ LIB_H += list-objects.h
LIB_H += ll-merge.h
LIB_H += log-tree.h
LIB_H += mailmap.h
+LIB_H += merge-file.h
LIB_H += merge-recursive.h
LIB_H += notes.h
LIB_H += notes-cache.h