From: Bruno Haible <bruno@clisp.org>
Date: Mon, 18 Dec 2006 13:01:43 +0000 (+0000)
Subject: Use minmax.
X-Git-Tag: v0.17~563
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d61268e7df5afeb86ff7002336f499070d6fea3;p=thirdparty%2Fgettext.git

Use minmax.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 0f53f863a..2a923a211 100644
--- 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 1c1fb8473..44f14d1ec 100644
--- 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 8e3dc2470..161ff605b 100644
--- 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: