# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1160242822 0
# Node ID 495459d266f190a645923da26238f8a167362c31
# Parent  6a5caacdedca7959eb5159398f1ed13509f935e6
Use MIN and MAX from minmax.h.

diff --git a/lib/analyze.c b/lib/analyze.c
--- a/lib/analyze.c
+++ b/lib/analyze.c
@@ -25,6 +25,7 @@
 #include <error.h>
 #include <file-type.h>
 #include <xalloc.h>
+#include "minmax.h"
 
 /* The core of the Diff algorithm.  */
 #define ELEMENT lin
diff --git a/lib/fstrcmp.c b/lib/fstrcmp.c
--- a/lib/fstrcmp.c
+++ b/lib/fstrcmp.c
@@ -53,6 +53,7 @@
 
 #include "lock.h"
 #include "tls.h"
+#include "minmax.h"
 #include "xalloc.h"
 
 #ifndef uintptr_t
@@ -392,7 +393,7 @@
 	      OFFSET x;
 	      OFFSET y;
 
-	      x = fd[d] < xlim ? fd[d] : xlim;
+	      x = MIN (fd[d], xlim);
 	      y = x - d;
 	      if (ylim < y)
 		{
@@ -413,7 +414,7 @@
 	      OFFSET x;
 	      OFFSET y;
 
-	      x = xoff > bd[d] ? xoff : bd[d];
+	      x = MAX (xoff, bd[d]);
 	      y = x - d;
 	      if (y < yoff)
 		{