X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=49d1116fc34f536ab9358313522a25564dd1f6c3;hb=57895105c4ff083d7c9bc59b2b88b9b5176c1915;hp=abba70c16bb31fae0df999241830d0c8df8bfbb3;hpb=f9bdf9b2102bd848c7a3eabff2ba5af63828de54;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index abba70c16..49d1116fc 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -9,8 +9,7 @@ typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long); int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, xdiff_emit_consume_fn fn, void *consume_callback_data, - xpparam_t const *xpp, - xdemitconf_t const *xecfg, xdemitcb_t *xecb); + xpparam_t const *xpp, xdemitconf_t const *xecfg); int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2, xdiff_emit_hunk_consume_fn fn, void *consume_callback_data, xpparam_t const *xpp, xdemitconf_t *xecfg);