Whip post 1.5.3.3 maintenance series into shape.

diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index ea38ee903fa142742797feb600b691b5a22b8165..d5de8292e05e7c36c4b68857c1cf9855e3d2f70a 100644 (file)
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
@@ -24,6 +24,7 @@
 #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);
@@ -33,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);
@@ -43,4 +45,3 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
 
 
 #endif /* #if !defined(XUTILS_H) */
-