===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- src/usr.bin/rcs/diff.c	2010/07/23 21:46:05	1.31
+++ src/usr.bin/rcs/diff.c	2011/04/01 17:25:26	1.32
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.31 2010/07/23 21:46:05 ray Exp $	*/
+/*	$OpenBSD: diff.c,v 1.32 2011/04/01 17:25:26 nicm Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -521,12 +521,15 @@
 stone(int *a, int n, int *b, int *c, int flags)
 {
 	int i, k, y, j, l;
-	int oldc, tc, oldl;
-	u_int numtries;
+	int oldc, tc, oldl, sq;
+	u_int numtries, bound;
 
-	/* XXX move the isqrt() out of the macro to avoid multiple calls */
-	const u_int bound = (flags & D_MINIMAL) ? UINT_MAX :
-	    MAX(256, isqrt(n));
+	if (flags & D_MINIMAL)
+		bound = UINT_MAX;
+	else {
+		sq = isqrt(n);
+		bound = MAX(256, sq);
+	}
 
 	k = 0;
 	c[0] = newcand(0, 0, 0);