difftool --no-index: error out on --dir-diff (and don't crash)

diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 2356da5f784fbe5670b3f9e8bbc6d6419b4fa9d3..b1583690208096f7bb75e0aa67cacc3179da1185 100644 (file)
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -86,7 +86,11 @@ typedef struct s_xpparam {
 
 typedef struct s_xdemitcb {
        void *priv;
-       int (*outf)(void *, mmbuffer_t *, int);
+       int (*out_hunk)(void *,
+                       long old_begin, long old_nr,
+                       long new_begin, long new_nr,
+                       const char *func, long funclen);
+       int (*out_line)(void *, mmbuffer_t *, int);
 } xdemitcb_t;
 
 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);