xdiff: avoid signed vs. unsigned comparisons in xemit.c

The unsigned `ignored` variable causes expressions to promote to
unsigned. Use a signed value to make comparisons use the same types.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 2b394a4806cc454c75daadee8de6095895e2c752..f8e3f25b03b7f79a60fa5c1418d61970c1360edc 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -20,8 +20,6 @@
  *
  */
 
-#define DISABLE_SIGN_COMPARE_WARNINGS
-
 #include "xinclude.h"
 
 static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
@@ -56,7 +54,7 @@ xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg)
        xdchange_t *xch, *xchp, *lxch;
        long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen;
        long max_ignorable = xecfg->ctxlen;
-       unsigned long ignored = 0; /* number of ignored blank lines */
+       long ignored = 0; /* number of ignored blank lines */
 
        /* remove ignorable changes that are too far before other changes */
        for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) {