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>
This commit is contained in:

committed by
Junio C Hamano

parent
a4c24549ac
commit
4e0d7a8018
@ -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);
|
||||
|
Reference in New Issue
Block a user