tr portability fixes

diff --git a/unpack-trees.h b/unpack-trees.h
index 191f7442f10683c8043288eece36f39166fedc95..e8abbcd037167a58c816d94f4f0c617d6572d23d 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -15,7 +15,10 @@ struct unpack_trees_options {
        int trivial_merges_only;
        int verbose_update;
        int aggressive;
+       int skip_unmerged;
+       int gently;
        const char *prefix;
+       int pos;
        struct dir_struct *dir;
        merge_fn_t fn;
 
@@ -23,9 +26,14 @@ struct unpack_trees_options {
        int merge_size;
 
        struct cache_entry *df_conflict_entry;
+       void *unpack_data;
+
+       struct index_state *dst_index;
+       const struct index_state *src_index;
+       struct index_state result;
 };
 
-extern int unpack_trees(struct object_list *trees,
+extern int unpack_trees(unsigned n, struct tree_desc *t,
                struct unpack_trees_options *options);
 
 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);