Merge branch 'js/wrap-log'

diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index 55b0d39f49d656576f83ccee8961ce5ea05e950e..70d8b9838a7333bc5a1edb93cf0e9abdbcf146cc 100644 (file)
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
@@ -24,6 +24,8 @@
 #define XUTILS_H
 
 
+
+long xdl_bogosqrt(long n);
 int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
                     xdemitcb_t *ecb);
 int xdl_cha_init(chastore_t *cha, long isize, long icount);
@@ -32,7 +34,8 @@ 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);
-unsigned long xdl_hash_record(char const **data, char const *top);
+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);