MALLOC_CHECK: Allow checking to be disabled from config.mak

diff --git a/builtin.h b/builtin.h
index 8e377522fee4be94f9cdca40d44ecdcc18b42d8b..95116b85358637d3457288c7d28526cb1fa93630 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -21,7 +21,6 @@ struct fmt_merge_msg_opts {
 
 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
                         struct fmt_merge_msg_opts *);
-extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {
        struct notes_tree **trees;
@@ -33,7 +32,6 @@ struct notes_rewrite_cfg {
        int mode_from_env;
 };
 
-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);