From: Bruno Haible Date: Thu, 21 Dec 2006 20:10:53 +0000 (+0000) Subject: Actually use the EQUAL macro. X-Git-Tag: v0.17~548 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55bf42ad80982245a0e66c56590fc3403f4e2873;p=thirdparty%2Fgettext.git Actually use the EQUAL macro. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 716c796f2..e8b7a264d 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,7 @@ +2006-12-21 Bruno Haible + + * lib/diffseq.h (diag, compareseq): Use the EQUAL macro. + 2006-12-19 Bruno Haible * m4/libxml.m4 (gl_LIBXML): Check for arpa/nameser.h and resolv.h diff --git a/gnulib-local/lib/diffseq.h b/gnulib-local/lib/diffseq.h index e0400b825..59da5fc5d 100644 --- a/gnulib-local/lib/diffseq.h +++ b/gnulib-local/lib/diffseq.h @@ -192,7 +192,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, x = thi; oldx = x; y = x - d; - while (x < xlim && y < ylim && xv[x] == yv[y]) + while (x < xlim && y < ylim && EQUAL (xv[x], yv[y])) { ++x; ++y; @@ -232,7 +232,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, x = thi - 1; oldx = x; y = x - d; - while (x > xoff && y > yoff && xv[x - 1] == yv[y - 1]) + while (x > xoff && y > yoff && EQUAL (xv[x - 1], yv[y - 1])) { --x; --y; @@ -283,7 +283,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, that it end with a significant snake. */ int k; - for (k = 1; xv[x - k] == yv[y - k]; k++) + for (k = 1; EQUAL (xv[x - k], yv[y - k]); k++) if (k == SNAKE_LIMIT) { best = v; @@ -319,7 +319,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, that it end with a significant snake. */ int k; - for (k = 0; xv[x + k] == yv[y + k]; k++) + for (k = 0; EQUAL (xv[x + k], yv[y + k]); k++) if (k == SNAKE_LIMIT - 1) { best = v; @@ -432,14 +432,14 @@ compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, const ELEMENT *const yv = ctxt->yvec; /* Slide down the bottom initial diagonal. */ - while (xoff < xlim && yoff < ylim && xv[xoff] == yv[yoff]) + while (xoff < xlim && yoff < ylim && EQUAL (xv[xoff], yv[yoff])) { ++xoff; ++yoff; } /* Slide up the top initial diagonal. */ - while (xlim > xoff && ylim > yoff && xv[xlim - 1] == yv[ylim - 1]) + while (xlim > xoff && ylim > yoff && EQUAL (xv[xlim - 1], yv[ylim - 1])) { --xlim; --ylim;