Merge branch 'master' into sp/mmap

diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h
index dd8f3c986be9cefa8ac61d54ec9646bbc62234fd..472aeaecfab85e7276baaceb446d2095eeab01fd 100644 (file)
--- a/xdiff/xdiffi.h
+++ b/xdiff/xdiffi.h
@@ -50,11 +50,11 @@ int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
                 long *kvdf, long *kvdb, int need_min, xdalgoenv_t *xenv);
 int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
                xdfenv_t *xe);
+int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags);
 int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr);
 void xdl_free_script(xdchange_t *xscr);
 int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
                  xdemitconf_t const *xecfg);
 
-
 #endif /* #if !defined(XDIFFI_H) */