summaryrefslogtreecommitdiff
path: root/xdiff/xemit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-08 16:05:39 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-08 16:05:39 -0800
commit1e2bba92d21d9c72d4a6816c3a98a22779856f9e (patch)
tree94f9729fb9c5ea36d305ffaeac22f9e957998f4d /xdiff/xemit.h
parent6abe9c87c78d4925e12e609f4f26447c6a579b9e (diff)
parentcdcab133ea75e0bd5c2279ce6c5718f4af4d9a03 (diff)
downloadgit-1e2bba92d21d9c72d4a6816c3a98a22779856f9e.tar.gz
Merge branch 'rs/blame'
* rs/blame: blame: use xdi_diff_hunks(), get rid of struct patch add xdi_diff_hunks() for callers that only need hunk lengths Allow alternate "low-level" emit function from xdl_diff Always initialize xpparam_t to 0 blame: inline get_patch()
Diffstat (limited to 'xdiff/xemit.h')
-rw-r--r--xdiff/xemit.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/xdiff/xemit.h b/xdiff/xemit.h
index 440a7390fa..c2e2e83027 100644
--- a/xdiff/xemit.h
+++ b/xdiff/xemit.h
@@ -24,7 +24,10 @@
#define XEMIT_H
+typedef int (*emit_func_t)(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
+ xdemitconf_t const *xecfg);
+xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg);
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
xdemitconf_t const *xecfg);