Subject: Re: Build failure in librump/rumpkern/fstrans_stub.c - ports i386 and amd64
To: Paul Goyette <paul@whooppee.com>
From: Kurt Schreiner <ks@ub.uni-mainz.de>
List: current-users
Date: 12/02/2007 19:13:08
On Sun, Dec 02, 2007 at 06:49:21PM +0100, Paul Goyette wrote:
> Sources updated via CVS as of Sunday, December 02, 2007 at 17:18:35 UTC
> 
> 
> /usr/src/sys/rump/librump/rumpkern/fstrans_stub.c:70: error: conflicting types for 'fscow_establish'
> /usr/src/sys/sys/fstrans.h:80: error: previous declaration of 'fscow_establish' was here
> /usr/src/sys/rump/librump/rumpkern/fstrans_stub.c:78: error: conflicting types for 'fscow_disestablish'
> /usr/src/sys/sys/fstrans.h:82: error: previous declaration of 'fscow_disestablish' was here
> /usr/src/sys/rump/librump/rumpkern/fstrans_stub.c:85: error: conflicting types for 'fscow_run'
> /usr/src/sys/sys/fstrans.h:83: error: previous declaration of 'fscow_run' was here
> *** [fstrans_stub.o] Error code 1
> 1 error

You can try the following patch to get it compiling again: (tried on i386,
no amd at hand...)

Kurt

>-1002: cvs diff -u sys/rump/librump/rumpkern/fstrans_stub.c
Index: sys/rump/librump/rumpkern/fstrans_stub.c
===================================================================
RCS file: /cvsroot/src/sys/rump/librump/rumpkern/fstrans_stub.c,v
retrieving revision 1.2
diff -u -r1.2 fstrans_stub.c
--- sys/rump/librump/rumpkern/fstrans_stub.c    7 Oct 2007 13:39:04 -0000       1.2
+++ sys/rump/librump/rumpkern/fstrans_stub.c    2 Dec 2007 18:11:02 -0000
@@ -66,14 +66,14 @@
 }
 
 int
-fscow_establish(struct mount *mp, int (*func)(void *, struct buf *), void *arg)
+fscow_establish(struct mount *mp, int (*func)(void *, struct buf *, bool), void *arg)
 {
 
        return 0;
 }
 
 int
-fscow_disestablish(struct mount *mp, int (*func)(void *, struct buf *),
+fscow_disestablish(struct mount *mp, int (*func)(void *, struct buf *, bool),
     void *arg)
 {
 
@@ -81,7 +81,7 @@
 }
 
 int
-fscow_run(struct buf *bp)
+fscow_run(struct buf *mp, bool b)
 {
 
        return 0;