Use minmax.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 0f53f863a158f3b008559602bc32fd99348ea075..2a923a2111dca11ae33a4f9e4bd26d00e3cfb414 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-07  Bruno Haible  <bruno@clisp.org>
 
+       * lib/fstrcmp.c: Include minmax.h.
+       * modules/fstrcmp (Depends-on): Add minmax.
+
        * lib/fstrcmp.c (IF_LINT): New macro.
 
        * lib/fstrcmp.c: Make comments and variable syntax closer to GNU

diff --git a/gnulib-local/lib/fstrcmp.c b/gnulib-local/lib/fstrcmp.c
index 1c1fb84738a55eba9d0e48fd3466e99d84183f60..44f14d1ec1869a17889f3400223d02327559d09b 100644 (file)
--- a/gnulib-local/lib/fstrcmp.c
+++ b/gnulib-local/lib/fstrcmp.c
@@ -53,6 +53,7 @@
 
 #include "lock.h"
 #include "tls.h"
+#include "minmax.h"
 #include "xalloc.h"
 
 #ifndef uintptr_t
@@ -388,7 +389,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)
                {
@@ -409,7 +410,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)
                {

diff --git a/gnulib-local/modules/fstrcmp b/gnulib-local/modules/fstrcmp
index 8e3dc2470e315cccd917aa3f4c73bad287ceed97..161ff605bc2a4afe5ccf56b83406de3396085a58 100644 (file)
--- a/gnulib-local/modules/fstrcmp
+++ b/gnulib-local/modules/fstrcmp
@@ -8,6 +8,7 @@ lib/fstrcmp.c
 Depends-on:
 lock
 tls
+minmax
 xalloc
 
 configure.ac: