Use MIN and MAX from minmax.h.

diff --git a/lib/analyze.c b/lib/analyze.c
index a7c9ca4c7602e6daf364fe446c1556dcf9bec0d7..772925b297a7fdecddd53355ff7939d1cdea005a 100644 (file)
--- 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 ee353f84fdfe124afbee12c4bcc48c8be1f5f09d..27e4a65d6b59eab23fd5ecaa779e75058c6dbc0f 100644 (file)
--- 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)
                {