usr.sbin/makefs/msdos.c:60:0: sys/fs/msdosfs/denode.h:296:39 error: kauth_cred_t

[David Shao <davshao%gmail.com@localhost>]

Attempting to update from 6.99.16 amd64 to current src through

Module Name:    src
Committed By:   christos
Date:           Sat Jan 26 00:31:50 UTC 2013

Modified Files:
        src/usr.sbin/makefs: Makefile msdos.h
        src/usr.sbin/makefs/msdos: msdosfs_vfsops.c msdosfs_vnops.c

encounter an error despite clearing /usr/obj and /usr/tools running
$ ./build.sh -O ../obj -T ../tools -U distribution

#   compile  makefs/msdos.lo
cc -O -I. -I/usr/src/../tools/include/nbinclude
-I/usr/src/../tools/include -I/usr/src/../tools/include/nbinclude
-I/usr/src/../tools/include/compat -I/usr/src/tools/compat
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
-I/usr/src/tools/makefs/../../usr.sbin/makefs -I/usr/src/sbin/mknod
-I/usr/src/usr.sbin/mtree -DMAKEFS -DMSDOSFS_DEBUG
-I/usr/src/sys/fs/cd9660 -I/usr/src/sys/ufs/chfs -DV7FS_EI
-I/usr/src/sys/fs/v7fs -I/usr/src/sbin/newfs_v7fs -I/usr/src/sbin/fsck
-DMSDOS_EI -I/usr/src/sys/fs/msdosfs -I/usr/src/sbin/newfs_msdos
-I/usr/src/sys -c -o msdos.lo.o
/usr/src/tools/makefs/../../usr.sbin/makefs/msdos.c
In file included from /usr/src/tools/makefs/../../usr.sbin/makefs/msdos.c:59:0:
/usr/src/tools/makefs/../../usr.sbin/makefs/ffs/buf.h:80:17: warning:
'struct kauth_cred' declared inside parameter list
/usr/src/tools/makefs/../../usr.sbin/makefs/ffs/buf.h:80:17: warning:
its scope is only this definition or declaration, which is probably
not what you want
In file included from /usr/src/tools/makefs/../../usr.sbin/makefs/msdos.c:60:0:
/usr/src/sys/fs/msdosfs/denode.h:296:39: error: expected declaration
specifiers or '...' before 'kauth_cred_t'
/usr/src/sys/fs/msdosfs/denode.h:298:43: error: expected declaration
specifiers or '...' before 'kauth_cred_t'
/usr/src/sys/fs/msdosfs/denode.h:309:58: error: expected declaration
specifiers or '...' before 'kauth_cred_t'

*** Failed target:  msdos.lo
*** Failed command: cc -O -I. -I/usr/src/../tools/include/nbinclude
-I/usr/src/../tools/include -I/usr/src/../tools/include/nbinclude
-I/usr/src/../tools/include/compat -I/usr/src/tools/compat
-DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
-I/usr/src/tools/makefs/../../usr.sbin/makefs -I/usr/src/sbin/mknod
-I/usr/src/usr.sbin/mtree -DMAKEFS -DMSDOSFS_DEBUG
-I/usr/src/sys/fs/cd9660 -I/usr/src/sys/ufs/chfs -DV7FS_EI
-I/usr/src/sys/fs/v7fs -I/usr/src/sbin/newfs_v7fs -I/usr/src/sbin/fsck
-DMSDOS_EI -I/usr/src/sys/fs/msdosfs -I/usr/src/sbin/newfs_msdos
-I/usr/src/sys -c -o msdos.lo.o
/usr/src/tools/makefs/../../usr.sbin/makefs/msdos.c
*** Error code 1

Stop.
nbmake: stopped in /usr/src/tools/makefs