===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- src/usr.bin/cvs/diff3.c	2007/06/28 21:38:09	1.37
+++ src/usr.bin/cvs/diff3.c	2007/09/10 14:29:53	1.38
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.37 2007/06/28 21:38:09 xsa Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.38 2007/09/10 14:29:53 tobias Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,12 +72,13 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.37 2007/06/28 21:38:09 xsa Exp $";
+    "$OpenBSD: diff3.c,v 1.38 2007/09/10 14:29:53 tobias Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -729,7 +730,7 @@
 	int i;
 
 	for (i = 0; i < 2; i++)
-		(void)fseek(fp[i], (long)-nchar, 1);
+		(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
 }
 
 /*
@@ -763,7 +764,7 @@
 			prange(&de[n].old);
 		else
 			diff_output("%da\n=======\n", de[n].old.to -1);
-		(void)fseek(fp[2], (long)de[n].new.from, 0);
+		(void)fseek(fp[2], (long)de[n].new.from, SEEK_SET);
 		for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
 			j = k > BUFSIZ ? BUFSIZ : k;
 			if (fread(block, (size_t)1, (size_t)j,