X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=f7f791d96b9a34ef0f08db4b007c5309b9adc3d6;hb=2c47789d817aaf745a5ce5d5f79619c634cc8566;hp=ec682a297108dc0a58203019693c1a1c4b0a91e1;hpb=d6102b53c8fcbc45567e48e3db1d1cb8498b0b94;p=git.git diff --git a/xdiff-interface.h b/xdiff-interface.h index ec682a297..f7f791d96 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -13,9 +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, - unsigned int *ob, unsigned int *on, - unsigned int *nb, unsigned int *nn); + 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