Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix

[git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index ec682a297108dc0a58203019693c1a1c4b0a91e1..23c49b99d1208d48bb19a3fb499b5f356b25ee7e 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -3,19 +3,19 @@
 
 #include "xdiff/xdiff.h"
 
-struct xdiff_emit_state;
-
 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
 
-struct xdiff_emit_state {
-       xdiff_emit_consume_fn consume;
-       char *remainder;
-       unsigned long remainder_size;
-};
-
-int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
+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);
 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, int cflags);
 
 #endif