--- a/mercurial/thirdparty/xdiff/xdiffi.h Sun Mar 04 11:30:16 2018 -0800
+++ b/mercurial/thirdparty/xdiff/xdiffi.h Fri Mar 09 14:24:27 2018 -0800
@@ -25,33 +25,33 @@
typedef struct s_diffdata {
- long nrec;
- unsigned long const *ha;
- long *rindex;
+ int64_t nrec;
+ uint64_t const *ha;
+ int64_t *rindex;
char *rchg;
} diffdata_t;
typedef struct s_xdalgoenv {
- long mxcost;
- long snake_cnt;
- long heur_min;
+ int64_t mxcost;
+ int64_t snake_cnt;
+ int64_t heur_min;
} xdalgoenv_t;
typedef struct s_xdchange {
struct s_xdchange *next;
- long i1, i2;
- long chg1, chg2;
+ int64_t i1, i2;
+ int64_t chg1, chg2;
int ignore;
} xdchange_t;
-int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
- diffdata_t *dd2, long off2, long lim2,
- long *kvdf, long *kvdb, int need_min, xdalgoenv_t *xenv);
+int xdl_recs_cmp(diffdata_t *dd1, int64_t off1, int64_t lim1,
+ diffdata_t *dd2, int64_t off2, int64_t lim2,
+ int64_t *kvdf, int64_t *kvdb, int need_min, xdalgoenv_t *xenv);
int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdfenv_t *xe);
-int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags);
+int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, int64_t flags);
int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr);
void xdl_free_script(xdchange_t *xscr);