FreeBSD 4.0-CURRENT, arla-0.23

[assar@stacken.kth.se]

Robert Watson <robert at cyrus.watson.org> writes:
> If you want access to a recent 4.0 machine, I could set up an
> account for you on one of my workstations.

I guess I should try to update my machine to a more recent -current instead.

> gcc -c  -DHAVE_CONFIG_H -I. -I.  -I../../include -I./../../include
> -I./../inclu
> de  -I/usr/athena/include -DXFS_DEBUG -g  -Wall -DKERNEL -D_KERNEL
> -DVFS_KLD -DK
> LD_MODULE -I/sys/arch -I/sys -I. -Wno-unused xfs_wrap-bsd.c
> xfs_wrap-bsd.c:135: parse error before `('
> xfs_wrap-bsd.c:135: warning: type defaults to `int' in declaration of
> `CDEV_MODU
> LE'
> xfs_wrap-bsd.c:135: `CDEV_MODULE' declared as function returning a
> function
> xfs_wrap-bsd.c:135: warning: type defaults to `int' in declaration of
> `xfs_dev'
> xfs_wrap-bsd.c:135: conflicting types for `xfs_dev'
> xfs_wrap-bsd.c:89: previous declaration of `xfs_dev'
> xfs_wrap-bsd.c:135: warning: type defaults to `int' in declaration of
> `xfs_load'
> xfs_wrap-bsd.c:135: `xfs_load' redeclared as different kind of symbol
> xfs_wrap-bsd.c:103: previous declaration of `xfs_load'
> xfs_wrap-bsd.c:135: parse error before `0'

Hm, that's because they killed cdevs, my -current was just before
that.  My quick fix for that is appended.

/assar

Index: xfs/bsd/xfs_wrap-bsd.c
===================================================================
RCS file: /usr/local/cvsroot/arla/xfs/bsd/xfs_wrap-bsd.c,v
retrieving revision 1.16
diff -u -w -u -w -r1.16 xfs_wrap-bsd.c
--- xfs_wrap-bsd.c	1999/01/10 06:28:26	1.16
+++ xfs_wrap-bsd.c	1999/05/16 22:54:39
@@ -132,7 +132,11 @@
 #define AFS_SYSCALL 210
 
 VFS_SET(xfs_vfsops, xfs, 0);
+#ifdef DEV_MODULE
+DEV_MODULE(xfs_dev, NODEV, NODEV, xfs_dev, xfs_load, NULL);
+#else
 CDEV_MODULE(xfs_dev, NODEV, xfs_dev, xfs_load, NULL);
+#endif
 #ifdef SYSCALL_MODULE
 static int offset = NO_SYSCALL;