d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed nested include of <ufs/ufs/dir.h>. Use the pre-Lite2 hack of

Browse Source 
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.
This commit is contained in:
Bruce Evans 1997-04-01 08:02:00 +00:00
parent a52432a3c6
commit 95e7aeb4e1
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/gnu/ext2fs/inode.h
View File

@ -36,15 +36,19 @@
* 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

8
sys/gnu/fs/ext2fs/inode.h
View File

@ -36,15 +36,19 @@
* 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

8
sys/ufs/ufs/inode.h
View File

@ -36,15 +36,19 @@
* 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