Merge branch 'maint' of git://repo.or.cz/git-gui into maint
[git/git.git] / xdiff-interface.h
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
3
4 #include "xdiff/xdiff.h"
5
6 struct xdiff_emit_state;
7
8 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
9
10 struct xdiff_emit_state {
11 xdiff_emit_consume_fn consume;
12 char *remainder;
13 unsigned long remainder_size;
14 };
15
16 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
17 int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
18 int parse_hunk_header(char *line, int len,
19 int *ob, int *on,
20 int *nb, int *nn);
21 int read_mmfile(mmfile_t *ptr, const char *filename);
22 int buffer_is_binary(const char *ptr, unsigned long size);
23
24 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line);
25
26 #endif