Mercurial > hg > octave-lyh > gnulib-hg

changeset 7443:495459d266f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use MIN and MAX from minmax.h.
author Bruno Haible <bruno@clisp.org>
date Sat, 07 Oct 2006 17:40:22 +0000
parents 6a5caacdedca
children 59373e106e46
files lib/analyze.c lib/fstrcmp.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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)
 		{