summaryrefslogtreecommitdiff
path: root/xdiff/xutils.h
diff options
context:
space:
mode:
Diffstat (limited to 'xdiff/xutils.h')
-rw-r--r--xdiff/xutils.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index d5de8292e0..ad1428ed69 100644
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
@@ -31,16 +31,15 @@ int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
int xdl_cha_init(chastore_t *cha, long isize, long icount);
void xdl_cha_free(chastore_t *cha);
void *xdl_cha_alloc(chastore_t *cha);
-void *xdl_cha_first(chastore_t *cha);
-void *xdl_cha_next(chastore_t *cha);
-long xdl_guess_lines(mmfile_t *mf);
+long xdl_guess_lines(mmfile_t *mf, long sample);
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags);
unsigned long xdl_hash_record(char const **data, char const *top, long flags);
unsigned int xdl_hashbits(unsigned int size);
int xdl_num_out(char *out, long val);
-long xdl_atol(char const *str, char const **next);
int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
const char *func, long funclen, xdemitcb_t *ecb);
+int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
+ int line1, int count1, int line2, int count2);