diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1997-04-01 08:02:00 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1997-04-01 08:02:00 +0000 |
| commit | 95e7aeb4e16a7f3be059335e268cfe002275ffa7 (patch) | |
| tree | 9dde475ee795e4107f9e0e4eff77fd1caba14f0d /sys/ufs | |
| parent | a52432a3c642ef1e00eea3bef0d7acd9cf5d3e40 (diff) | |
| download | src-95e7aeb4e16a7f3be059335e268cfe002275ffa7.tar.gz src-95e7aeb4e16a7f3be059335e268cfe002275ffa7.zip | |
Removed nested include of <ufs/ufs/dir.h>. Use the pre-Lite2 hack of
defining doff_t both here and in <ufs/ufs/dir.h> so that this file
is independent of <ufs/ufs/dir.h>. It still has old prerequisites
<sys/param.h> and <ufs/ufs/quota.h>, and a new Lite2 prerequisite of
<sys/lock.h>, sigh.
This might fix lsof, which was broken by namespace pollution giving
conflicting definitions of DIRBLKSIZ.
Notes
Notes:
svn path=/head/; revision=24477
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/inode.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h index 3346cec2bb09..238f838a5271 100644 --- a/sys/ufs/ufs/inode.h +++ b/sys/ufs/ufs/inode.h @@ -36,16 +36,20 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $Id: inode.h,v 1.12 1997/02/22 09:47:42 peter Exp $ + * $Id: inode.h,v 1.13 1997/03/03 16:25:46 bde Exp $ */ #ifndef _UFS_UFS_INODE_H_ #define _UFS_UFS_INODE_H_ -#include <ufs/ufs/dir.h> #include <ufs/ufs/dinode.h> /* + * This must agree with the definition in <ufs/ufs/dir.h>. + */ +#define doff_t int32_t + +/* * The inode is used to describe each active (or recently active) file in the * UFS filesystem. It is composed of two types of information. The first part * is the information that is needed only while the file is active (such as |