From c2ac0f30588c967154c032cb24a0210e09828d52 Mon Sep 17 00:00:00 2001
From: xsa <xsa@openbsd.org>
Date: Thu, 22 Feb 2007 08:30:45 +0000
Subject: Fix const inconsistencies, void pointer artithmetic; Based on diff
 from otto@ in OpenCVS. OK otto@.

---
 usr.bin/rcs/diff.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'usr.bin/rcs/diff.c')

diff --git a/usr.bin/rcs/diff.c b/usr.bin/rcs/diff.c
index b5aa4f15729..929f198164a 100644
--- a/usr.bin/rcs/diff.c
+++ b/usr.bin/rcs/diff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.c,v 1.10 2006/09/27 06:25:46 ray Exp $	*/
+/*	$OpenBSD: diff.c,v 1.11 2007/02/22 08:30:45 xsa Exp $	*/
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
  * All rights reserved.
@@ -536,7 +536,8 @@ stone(int *a, int n, int *b, int *c, int flags)
 	u_int numtries;
 
 	/* 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));
+	const u_int bound = (flags & D_MINIMAL) ? UINT_MAX :
+	    MAX(256, (u_int)isqrt(n));
 
 	k = 0;
 	if ((ret = newcand(0, 0, 0)) < 0)
-- 
cgit v1.2.3-59-g8ed1b