summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-25 18:45:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-25 18:45:27 (GMT)
commitf526d120f649ec4426b559e94e09655b5a4f2b87 (patch)
treed1be8cbf55a8f0913b4347bece6ea5ecbcb580b0 /builtin.h
parentba4d01bd74edae1e4adb540a03ba17961f8dd4b2 (diff)
parent9eafa1201b2dcc703258ca7cd53de8ac4de74565 (diff)
downloadgit-f526d120f649ec4426b559e94e09655b5a4f2b87.zip
git-f526d120f649ec4426b559e94e09655b5a4f2b87.tar.gz
git-f526d120f649ec4426b559e94e09655b5a4f2b87.tar.bz2
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 'builtin.h')
-rw-r--r--builtin.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin.h b/builtin.h
index b614d12..1054c6e 100644
--- a/builtin.h
+++ b/builtin.h
@@ -23,13 +23,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);