Merge git://git.bogomips.org/git-svn

diff --git a/xdiff/xemit.h b/xdiff/xemit.h
index 440a7390fa4abb0411c336cfba616e3229484e86..c2e2e830273782dc597606ddbb0401c04dce8f8f 100644 (file)
--- 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);