Merge branch 'maint'

[git.git] / xdiff-interface.h

diff --git a/xdiff-interface.h b/xdiff-interface.h
index 6f3b361a845f0f71ece8188e00a3cfa12138edd4..558492ba38c50351a98f80c16e83a058ace849ab 100644 (file)
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -3,19 +3,12 @@
 
 #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 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,
-                 struct xdiff_emit_state *state, xpparam_t const *xpp,
+                 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,