Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Mar 1997 00:06:21 +1100
From:      Bruce Evans <bde@zeta.org.au>
To:        cvs-all@freefall.freebsd.org, CVS-committers@freefall.freebsd.org, cvs-ports@freefall.freebsd.org, obrien@NUXI.com
Subject:   Re: cvs commit:  ports/sysutils/lsof Makefile ports/sysutils/lsof/files md5 ports/sysutils/lsof/pkg PLIST
Message-ID:  <199703251306.AAA28317@godzilla.zeta.org.au>

next in thread | raw e-mail | index | archive | help
>> ===>  Building for lsof-4.02
>> (cd lib; make DEBUG="-O")
>> gcc -O  -DFREEBSDV=300  -DHASFDESCFS -DHASPROCFS=proc  -c ckfa.c
>> gcc -O  -DFREEBSDV=300  -DHASFDESCFS -DHASPROCFS=proc  -c cvfs.c
>> gcc -O  -DFREEBSDV=300  -DHASFDESCFS -DHASPROCFS=proc  -c dvch.c
>> In file included from /usr/include/ufs/ufs/inode.h:45,
>>                  from ../dlsof.h:83,
>>                  from ../lsof.h:52,
>>                  from dvch.c:43:
>> /usr/include/ufs/ufs/dir.h:78: warning: `DIRBLKSIZ' redefined
>> /usr/include/dirent.h:52: warning: this is the location of the previous definition
>
>HELP Bruce!
>
>We can't include both <dirent.h> and <ufs/ufs/inode.h> in the same file.
>Shouldn't we be able to?

Lite2 broke it by importing doff_t from <ufs/ufs/dir.h>.  I've been planning
to fix DIRBLKSIZ for other reasons.  My kernel builds have been complaining
about it for some time:

!In file included from @/ufs/ufs/inode.h:45,
!                 from ./@/ufs/ufs/ufs_vnops.c:63:
!@/ufs/ufs/dir.h:78: warning: `DIRBLKSIZ' redefined
!@/sys/dirent.h:108: warning: this is the location of the previous definition
!@/ufs/ufs/dir.h:121: warning: `DIRSIZ' redefined
!@/sys/dirent.h:119: warning: this is the location of the previous definition

Ufs's directory struct is horribly mixed up with <dirent.h>.  The #defines
even conflict with the ufs ones now, although they were once probably
identical.  There is a real conflict in ext2fs, which uses lots of ufs
code but has to #undef DIRBLKSIZ since its own directory block size is 
the same as the (variable) file system block size.  I think I'll just
add UFS_ to some of the ufs macros.

Bruce



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199703251306.AAA28317>