aboutsummaryrefslogtreecommitdiff
path: root/notes.h
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 /notes.h
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 'notes.h')
-rw-r--r--notes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/notes.h b/notes.h
index 9f59277c5..109bc8f78 100644
--- a/notes.h
+++ b/notes.h
@@ -18,7 +18,7 @@
* combine_notes_concatenate(), which appends the contents of the new note to
* the contents of the existing note.
*/
-typedef int combine_notes_fn(unsigned char *cur_sha1, const unsigned char *new_sha1);
+typedef int (*combine_notes_fn)(unsigned char *cur_sha1, const unsigned char *new_sha1);
/* Common notes combinators */
int combine_notes_concatenate(unsigned char *cur_sha1, const unsigned char *new_sha1);
@@ -38,7 +38,7 @@ extern struct notes_tree {
struct int_node *root;
struct non_note *first_non_note, *prev_non_note;
char *ref;
- combine_notes_fn *combine_notes;
+ combine_notes_fn combine_notes;
int initialized;
int dirty;
} default_notes_tree;