Merge branch 'jc/bindiff' into next

diff --git a/cache-tree.h b/cache-tree.h
index c70a7699a9f13da74304a3f882daf2d810ff5398..72c64801f5e16d1e5d03dab505a388138dfcd8ab 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -20,11 +20,12 @@ struct cache_tree {
 struct cache_tree *cache_tree(void);
 void cache_tree_free(struct cache_tree **);
 void cache_tree_invalidate_path(struct cache_tree *, const char *);
+struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
 
 void *cache_tree_write(struct cache_tree *root, unsigned long *size_p);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
 int cache_tree_fully_valid(struct cache_tree *);
-int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int);
+int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
 
 #endif