From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Oct 2006 17:40:22 +0000 (+0000)
Subject: Use MIN and MAX from minmax.h.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62b07b53fd1e350ff02a4b860ff8569781e98866;p=thirdparty%2Fgnulib.git

Use MIN and MAX from minmax.h.
---

diff --git a/lib/analyze.c b/lib/analyze.c
index a7c9ca4c76..772925b297 100644
--- 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
index ee353f84fd..27e4a65d6b 100644
--- 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 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
 	      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 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal,
 	      OFFSET x;
 	      OFFSET y;
 
-	      x = xoff > bd[d] ? xoff : bd[d];
+	      x = MAX (xoff, bd[d]);
 	      y = x - d;
 	      if (y < yoff)
 		{