X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxutils.h;h=714719a89cba9170820bf7d54b9c569d42861aa4;hb=5c5845eb01c05830270bbb5cf3668891e48629df;hp=d5de8292e05e7c36c4b68857c1cf9855e3d2f70a;hpb=77ad7a49d3cc946487ca759e5361effbcfb03be5;p=git.git

diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index d5de8292e..714719a89 100644
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
@@ -33,7 +33,7 @@ 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);
@@ -41,6 +41,8 @@ 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);