X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=xdiff%2Fxdiff.h;h=c00ddaa6e987407743d2c8877f9ca6e772f89c86;hb=e708af6e587ae0ecb2a6480e3614c5ec4a164106;hp=e874a7c46a90104ebf586d0fc48964634f356763;hpb=0a98f9d13802880a68ce6564b9f47b1c3e3341c7;p=git.git diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index e874a7c46..c00ddaa6e 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -73,9 +73,13 @@ typedef struct s_xdemitcb { int (*outf)(void *, mmbuffer_t *, int); } xdemitcb_t; +typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); + typedef struct s_xdemitconf { long ctxlen; unsigned long flags; + find_func_t find_func; + void *find_func_priv; } xdemitconf_t; typedef struct s_bdiffparam { @@ -103,4 +107,3 @@ int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1, #endif /* #ifdef __cplusplus */ #endif /* #if !defined(XDIFF_H) */ -