aboutsummaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-06-23 20:40:19 +0100
committerJunio C Hamano <gitster@pobox.com>2010-06-24 09:42:12 -0700
commit4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19 (patch)
tree873627558b8f03c583db78abb01185a4aba3dc5a /builtin/notes.c
parenta4c24549acf16f7917ea3ddd811c6c61afc5689c (diff)
downloadgit-4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19.tar.gz
git-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/notes.c')
-rw-r--r--builtin/notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/notes.c b/builtin/notes.c
index 26617546c..da504ee0a 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -313,7 +313,7 @@ int commit_notes(struct notes_tree *t, const char *msg)
return 0;
}
-combine_notes_fn *parse_combine_notes_fn(const char *v)
+combine_notes_fn parse_combine_notes_fn(const char *v)
{
if (!strcasecmp(v, "overwrite"))
return combine_notes_overwrite;