Actually use the EQUAL macro.diff-merge

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/diffseq.h b/lib/diffseq.h
index 0f9d6eb56a..c083064bf7 100644
--- a/lib/diffseq.h
+++ b/lib/diffseq.h
@@ -191,7 +191,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;
@@ -231,7 +231,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;
@@ -282,7 +282,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;
@@ -318,7 +318,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;
@@ -431,13 +431,13 @@ 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;