diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2011-10-09 17:33:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-09 20:20:54 (GMT) |
| commit | 273c7032e9e79613349e24db3b0e40e8b5c0c62c (patch) | |
| tree | d09ed1df45bac3aedf436e65795ca4f0a98b808b /environment.c | |
| parent | 22a8699a6b1587024b884a80d88631db6a0ef511 (diff) | |
| download | git-273c7032e9e79613349e24db3b0e40e8b5c0c62c.zip git-273c7032e9e79613349e24db3b0e40e8b5c0c62c.tar.gz git-273c7032e9e79613349e24db3b0e40e8b5c0c62c.tar.bz2 | |
environment.c: Fix an sparse "symbol not declared" warning
In particular, sparse issues the following warning:
environment.c:62:5: warning: symbol 'merge_log_config' was not \
declared. Should it be static?
In order to supress the warning, we include the "fmt-merge-msg.h"
header file, since it contains an appropriate extern declaration for
the 'merge_log_config' variable.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'environment.c')
| -rw-r--r-- | environment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c index ba9781b..4b7ecab 100644 --- a/environment.c +++ b/environment.c @@ -9,6 +9,7 @@ */ #include "cache.h" #include "refs.h" +#include "fmt-merge-msg.h" char git_default_email[MAX_GITNAME]; char git_default_name[MAX_GITNAME]; |