Merge branch 'tl/anno' into next

diff --git a/diffcore.h b/diffcore.h
index 91d6c631e69a1f628fa65feecab1ee8b1fb73fad..7f9889daf375a0c310fddefeffa0bad5f4d1393c 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -101,4 +101,10 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
 #define diff_debug_queue(a,b) do {} while(0)
 #endif
 
+extern int diffcore_count_changes(void *src, unsigned long src_size,
+                                 void *dst, unsigned long dst_size,
+                                 unsigned long delta_limit,
+                                 unsigned long *src_copied,
+                                 unsigned long *literal_added);
+
 #endif