X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff-interface.h;h=558492ba38c50351a98f80c16e83a058ace849ab;hb=3814c07498f87e7d27b55175ca2852fcc4cd27f4;hp=536f4e4d9784e0e5ffdc108a5be4bf758d1578ba;hpb=75d8ff138dd640a117c6aaa625d0f6b835adbd3a;p=git.git

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 536f4e4d9..558492ba3 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -3,21 +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,
 		      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