X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;fp=xdiff-interface.h;h=6f3b361a845f0f71ece8188e00a3cfa12138edd4;hb=c99db9d292c5f63c83ae2b441a67121d76553413;hp=f7f791d96b9a34ef0f08db4b007c5309b9adc3d6;hpb=a0653d550524a0263d36fde6a8cf98941dd057ab;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index f7f791d96..6f3b361a8 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -14,7 +14,9 @@ struct xdiff_emit_state { }; int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); -int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf); +int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, + struct xdiff_emit_state *state, xpparam_t const *xpp, + xdemitconf_t const *xecfg, xdemitcb_t *xecb); int parse_hunk_header(char *line, int len, int *ob, int *on, int *nb, int *nn);