projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c8f1444) | patch
sparse: Fix an "symbol 'merge_file' not decared" warning
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>
Thu, 7 Apr 2011 18:31:24 +0000 (19:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Apr 2011 17:35:25 +0000 (10:35 -0700)
commit1e0f8c41ac157c54a33f2ee0afb7d96f5156ed0d
tree980fa8b4c2a8f0adf0401f7d172697450da83e9btree | snapshot
parentc8f1444d9e708e3994c74c180194c43bf1588b65commit | diff
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>
Makefile diff | blob | history
builtin/merge-tree.c diff | blob | history
merge-file.c diff | blob | history
merge-file.h [new file with mode: 0644] blob
Git—the stupid content tracker