Index: vinumext.h
===================================================================
RCS file: /host/ares/usr/home/ncvs/src/sys/dev/vinum/vinumext.h,v
retrieving revision 1.27
diff -u -r1.27 vinumext.h
--- vinumext.h	2000/05/11 07:22:18	1.27
+++ vinumext.h	2000/07/14 04:30:43
@@ -157,7 +157,6 @@
 #else
 void longjmp(jmp_buf, int);				    /* the kernel doesn't define this */
 #endif
-int setjmp(jmp_buf);
 
 void expand_table(void **, int, int);
 
Index: vinumhdr.h
===================================================================
RCS file: /host/ares/usr/home/ncvs/src/sys/dev/vinum/vinumhdr.h,v
retrieving revision 1.17
diff -u -r1.17 vinumhdr.h
--- vinumhdr.h	2000/05/05 09:57:49	1.17
+++ vinumhdr.h	2000/07/14 04:27:23
@@ -63,11 +63,10 @@
 #include <sys/fcntl.h>
 #include <sys/vnode.h>
 #include <sys/queue.h>
+#include <setjmp.h>
 #ifdef _KERNEL
-#include <machine/setjmp.h>
 #include <machine/stdarg.h>
 #else
-#include <setjmp.h>
 #include <stdarg.h>
 #endif
 #include <vm/vm.h>
Index: vinumlock.c
===================================================================
RCS file: /host/ares/usr/home/ncvs/src/sys/dev/vinum/vinumlock.c,v
retrieving revision 1.19
diff -u -r1.19 vinumlock.c
--- vinumlock.c	2000/05/04 07:37:11	1.19
+++ vinumlock.c	2000/07/14 05:06:08
@@ -248,7 +248,7 @@
 		}
 #endif
 		plex->lockwaits++;			    /* waited one more time */
-		    tsleep((void *) lock->stripe, PRIBIO, "vrlock", 2 * hz);
+		    tsleep((void *)(uintptr_t) lock->stripe, PRIBIO, "vrlock", 2 * hz);
 		lock = plex->lock;			    /* start again */
 		foundlocks = 0;
 		pos = NULL;
@@ -287,13 +287,13 @@
 void
 unlockrange(int plexno, struct rangelock *lock)
 {
-    daddr_t lockaddr;
+    uintptr_t lockaddr;
 
 #ifdef VINUMDEBUG
     if (debug & DEBUG_LASTREQS)
 	logrq(loginfo_unlock, (union rqinfou) lock, lock->bp);
 #endif
-    lockaddr = lock->stripe;
+    lockaddr = (uintptr_t)lock->stripe;
     lock->stripe = 0;					    /* no longer used */
     PLEX[plexno].usedlocks--;				    /* one less lock */
     wakeup((void *) lockaddr);
Index: vinumrevive.c
===================================================================
RCS file: /host/ares/usr/home/ncvs/src/sys/dev/vinum/vinumrevive.c,v
retrieving revision 1.31
diff -u -r1.31 vinumrevive.c
--- vinumrevive.c	2000/06/07 03:33:09	1.31
+++ vinumrevive.c	2000/07/14 05:21:14
@@ -310,7 +310,7 @@
 		reply->error = EIO;
 	    sprintf(reply->msg,
 		"Parity incorrect at offset 0x%llx\n",
-		errorloc);
+		(long long)errorloc);
 	}
 	if (reply->error == EAGAIN) {			    /* still OK, */
 	    plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT);	/* moved this much further down */