aboutsummaryrefslogtreecommitdiff
path: root/notes.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-25 11:45:27 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-25 11:45:27 -0700
commitf526d120f649ec4426b559e94e09655b5a4f2b87 (patch)
treed1be8cbf55a8f0913b4347bece6ea5ecbcb580b0 /notes.h
parentba4d01bd74edae1e4adb540a03ba17961f8dd4b2 (diff)
parent9eafa1201b2dcc703258ca7cd53de8ac4de74565 (diff)
downloadgit-f526d120f649ec4426b559e94e09655b5a4f2b87.tar.gz
git-f526d120f649ec4426b559e94e09655b5a4f2b87.tar.xz
Merge branch 'maint'
* maint: msvc: Fix some compiler warnings Documentation: grep: fix asciidoc problem with -- msvc: Fix some "expr evaluates to function" compiler warnings
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 cc2dff22a..65fc3a66b 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;