summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2010-06-23 19:40:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-24 16:42:12 (GMT)
commit4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19 (patch)
tree873627558b8f03c583db78abb01185a4aba3dc5a /builtin.h
parenta4c24549acf16f7917ea3ddd811c6c61afc5689c (diff)
downloadgit-4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19.zip
git-4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19.tar.gz
git-4e0d7a80186c27f1a008dd10eaea6f25b0e1fe19.tar.bz2
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.h')
-rw-r--r--builtin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin.h b/builtin.h
index 322901f..fdae027 100644
--- a/builtin.h
+++ b/builtin.h
@@ -26,13 +26,13 @@ struct notes_rewrite_cfg {
struct notes_tree **trees;
const char *cmd;
int enabled;
- combine_notes_fn *combine;
+ combine_notes_fn combine;
struct string_list *refs;
int refs_from_env;
int mode_from_env;
};
-combine_notes_fn *parse_combine_notes_fn(const char *v);
+combine_notes_fn parse_combine_notes_fn(const char *v);
struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
const unsigned char *from_obj, const unsigned char *to_obj);