===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/rcs/diff3.c	2007/01/11 18:13:33	1.18
+++ src/usr.bin/rcs/diff3.c	2007/02/22 08:30:45	1.19
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.18 2007/01/11 18:13:33 niallo Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.19 2007/02/22 08:30:45 xsa Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,7 +72,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.18 2007/01/11 18:13:33 niallo Exp $";
+    "$OpenBSD: diff3.c,v 1.19 2007/02/22 08:30:45 xsa Exp $";
 #endif /* not lint */
 
 #include "includes.h"
@@ -411,11 +411,11 @@
 
 	if (oflag) {
 		i = snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark);
-		if (i < 0 || i >= sizeof(f1mark))
+		if (i < 0 || i >= (int)sizeof(f1mark))
 			errx(1, "diff3_internal: string truncated");
 
 		i = snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark);
-		if (i < 0 || i >= sizeof(f3mark))
+		if (i < 0 || i >= (int)sizeof(f3mark))
 			errx(1, "diff3_internal: string truncated");
 	}