t6010 (merge-base): modernize style

diff --git a/tree-walk.h b/tree-walk.h
index 7c4ae646be201ce17e30eb1c935ad9acb6f4a0e9..42110a465f9a8c91d1bc643dfae7a9b9c32e3719 100644 (file)
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -34,14 +34,15 @@ int tree_entry(struct tree_desc *, struct name_entry *);
 void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
 
 struct traverse_info;
-typedef void (*traverse_callback_t)(int n, unsigned long mask, struct name_entry *entry, struct traverse_info *);
-void traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
+typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
+int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info);
 
 struct traverse_info {
        struct traverse_info *prev;
        struct name_entry name;
        int pathlen;
 
+       unsigned long conflicts;
        traverse_callback_t fn;
        void *data;
 };