gjournal_20060808.patch on amd64 7-current

Hi Pawel,

FreeBSD/amd64-current and gjournal_20060808.patch

make build world.....

In file included from /usr/src/sbin/fsck_ffs/gjournal.c:848:
/usr/src/sbin/fsck_ffs/fsck.h:72: error: redefinition of `union dinode'
/usr/src/sbin/fsck_ffs/fsck.h:94: error: redefinition of `struct inostat'
/usr/src/sbin/fsck_ffs/fsck.h:121: error: redefinition of `struct inostatlist'
/usr/src/sbin/fsck_ffs/fsck.h:129: error: redefinition of `struct bufarea'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: redeclaration of `enum fixstate'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: conflicting types for 'DONTKNOW'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'DONTKNOW' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: conflicting types for 'NOFIX'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'NOFIX' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: conflicting types for 'FIX'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'FIX' was here
/usr/src/sbin/fsck_ffs/fsck.h:185: error: conflicting types for 'IGNORE'
/usr/src/sbin/fsck_ffs/fsck.h:185: error: previous definition of 'IGNORE' was here
/usr/src/sbin/fsck_ffs/fsck.h:188: error: redefinition of `struct inodesc'
/usr/src/sbin/fsck_ffs/fsck.h:230: error: redefinition of `struct dups'
/usr/src/sbin/fsck_ffs/fsck.h:240: error: redefinition of `struct inoinfo'
/usr/src/sbin/fsck_ffs/gjournal.c:850: error: redefinition of `struct cgchain'
/usr/src/sbin/fsck_ffs/gjournal.c:862: error: redefinition of 'ncgs'
/usr/src/sbin/fsck_ffs/gjournal.c:88: error: previous definition of 'ncgs' was here
/usr/src/sbin/fsck_ffs/gjournal.c:863: error: conflicting types for 'cglist'
/usr/src/sbin/fsck_ffs/gjournal.c:89: error: previous definition of 'cglist' was here
/usr/src/sbin/fsck_ffs/gjournal.c:866: error: redefinition of 'disk'
/usr/src/sbin/fsck_ffs/gjournal.c:92: error: previous definition of 'disk' was here
/usr/src/sbin/fsck_ffs/gjournal.c:867: error: redefinition of 'fs'
/usr/src/sbin/fsck_ffs/gjournal.c:93: error: previous definition of 'fs' was here
/usr/src/sbin/fsck_ffs/gjournal.c:877: error: redefinition of 'putino'
/usr/src/sbin/fsck_ffs/gjournal.c:103: error: previous definition of 'putino' was here
/usr/src/sbin/fsck_ffs/gjournal.c:900: error: redefinition of 'getcg'
/usr/src/sbin/fsck_ffs/gjournal.c:126: error: previous definition of 'getcg' was here
/usr/src/sbin/fsck_ffs/gjournal.c:946: error: redefinition of 'dirtycg'
/usr/src/sbin/fsck_ffs/gjournal.c:172: error: previous definition of 'dirtycg' was here
/usr/src/sbin/fsck_ffs/gjournal.c:956: error: redefinition of 'busycg'
/usr/src/sbin/fsck_ffs/gjournal.c:182: error: previous definition of 'busycg' was here
/usr/src/sbin/fsck_ffs/gjournal.c:966: error: redefinition of 'unbusycg'
/usr/src/sbin/fsck_ffs/gjournal.c:192: error: previous definition of 'unbusycg' was here
/usr/src/sbin/fsck_ffs/gjournal.c:977: error: redefinition of 'putcgs'
/usr/src/sbin/fsck_ffs/gjournal.c:203: error: previous definition of 'putcgs' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1023: error: redefinition of 'getdisk'
/usr/src/sbin/fsck_ffs/gjournal.c:249: error: previous definition of 'getdisk' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1061: error: redefinition of 'closedisk'
/usr/src/sbin/fsck_ffs/gjournal.c:287: error: previous definition of 'closedisk' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1083: error: redefinition of 'putdisk'
/usr/src/sbin/fsck_ffs/gjournal.c:309: error: previous definition of 'putdisk' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1120: error: redefinition of 'isblock'
/usr/src/sbin/fsck_ffs/gjournal.c:346: error: previous definition of 'isblock' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1146: error: redefinition of 'setblock'
/usr/src/sbin/fsck_ffs/gjournal.c:372: error: previous definition of 'setblock' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1171: error: redefinition of 'isfreeblock'
/usr/src/sbin/fsck_ffs/gjournal.c:397: error: previous definition of 'isfreeblock' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1194: error: redefinition of 'fragacct'
/usr/src/sbin/fsck_ffs/gjournal.c:420: error: previous definition of 'fragacct' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1221: error: redefinition of 'clusteracct'
/usr/src/sbin/fsck_ffs/gjournal.c:447: error: previous definition of 'clusteracct' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1301: error: redefinition of 'blkfree'
/usr/src/sbin/fsck_ffs/gjournal.c:527: error: previous definition of 'blkfree' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1368: error: redefinition of 'freeindir'
/usr/src/sbin/fsck_ffs/gjournal.c:594: error: previous definition of 'freeindir' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1397: error: redefinition of 'clear_inode'
/usr/src/sbin/fsck_ffs/gjournal.c:623: error: previous definition of 'clear_inode' was here
/usr/src/sbin/fsck_ffs/gjournal.c:1438: error: redefinition of 'gjournal_check'
/usr/src/sbin/fsck_ffs/gjournal.c:664: error: previous definition of 'gjournal_check' was here
*** Error code 1

Stop in /usr/src/sbin/fsck_ffs.
*** Error code 1

Stop in /usr/obj/usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue/rescue.
*** Error code 1

Stop in /usr/src/rescue.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.

If you need more info, let me know.

Bye