diff options
author | 2010-06-23 20:40:19 +0100 | |
---|---|---|
committer | 2010-06-24 09:42:12 -0700 | |
commit | 4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19 (patch) | |
tree | 873627558b8f03c583db78abb01185a4aba3dc5a /builtin/merge-recursive.c | |
parent | Update draft release notes to 1.7.1.1 (diff) | |
download | tgif-4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19.tar.xz |
msvc: Fix some "expr evaluates to function" compiler warnings
In particular, the following warning is issued while compiling
notes.c:
notes.c(927) : warning C4550: expression evaluates to a \
function which is missing an argument list
along with identical warnings on lines 928, 1016 and 1017.
In order to suppress the warning, we change the definition of
combine_notes_fn, so that the symbol type is an (explicit)
"pointer to function ...". As a result, several other
declarations need some minor fix-up to take account of the
new typedef.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions