submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / xdiff-interface.h
blob49d1116fc34f536ab9358313522a25564dd1f6c3
1 #ifndef XDIFF_INTERFACE_H
2 #define XDIFF_INTERFACE_H
4 #include "xdiff/xdiff.h"
6 typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
7 typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
9 int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
10 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
11 xdiff_emit_consume_fn fn, void *consume_callback_data,
12 xpparam_t const *xpp, xdemitconf_t const *xecfg);
13 int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
14 xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
15 xpparam_t const *xpp, xdemitconf_t *xecfg);
16 int parse_hunk_header(char *line, int len,
17 int *ob, int *on,
18 int *nb, int *nn);
19 int read_mmfile(mmfile_t *ptr, const char *filename);
20 void read_mmblob(mmfile_t *ptr, const unsigned char *sha1);
21 int buffer_is_binary(const char *ptr, unsigned long size);
23 extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line, int cflags);
24 extern void xdiff_clear_find_func(xdemitconf_t *xecfg);
25 extern int git_xmerge_config(const char *var, const char *value, void *cb);
26 extern int git_xmerge_style;
28 #endif