X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=f7f791d96b9a34ef0f08db4b007c5309b9adc3d6;hb=6072fc314e87d53bec7266df5b6c3db2c2c82829;hp=1918808081c00daf20a16a1592c0ed9be6d79be4;hpb=27ebd6e0443bdd795869f598ecebc9eadd64a26c;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index 191880808..f7f791d96 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -13,10 +13,14 @@ struct xdiff_emit_state { unsigned long remainder_size; }; +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 parse_hunk_header(char *line, int len, int *ob, int *on, int *nb, int *nn); int read_mmfile(mmfile_t *ptr, const char *filename); +int buffer_is_binary(const char *ptr, unsigned long size); + +extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line); #endif