From a3c00cd8e36b303f0753412d12203d68af8c07e4 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Fri, 10 Jul 2015 09:21:59 -0500
Subject: [PATCH] xdiff: cleanup some warnings

---
 src/xdiff/xdiffi.c | 2 ++
 src/xdiff/xemit.c  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xdiff/xdiffi.c b/src/xdiff/xdiffi.c
index 2358a2d63..0620e5fff 100644
--- a/src/xdiff/xdiffi.c
+++ b/src/xdiff/xdiffi.c
@@ -544,6 +544,8 @@ static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 {
 	xdchange_t *xch, *xche;
 
+	(void)xe;
+
 	for (xch = xscr; xch; xch = xche->next) {
 		xche = xdl_get_hunk(&xch, xecfg);
 		if (!xch)
diff --git a/src/xdiff/xemit.c b/src/xdiff/xemit.c
index 750a97294..600fd1fdd 100644
--- a/src/xdiff/xemit.c
+++ b/src/xdiff/xemit.c
@@ -90,7 +90,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
 		} else if (distance < max_ignorable && xch->ignore) {
 			ignored += xch->chg2;
 		} else if (lxch != xchp &&
-			   xch->i1 + ignored - (lxch->i1 + lxch->chg1) > max_common) {
+			   xch->i1 + ignored - (lxch->i1 + lxch->chg1) > (unsigned long)max_common) {
 			break;
 		} else if (!xch->ignore) {
 			lxch = xch;