mirror of
https://github.com/opnsense/src.git
synced 2026-06-11 01:30:30 -04:00
Moved kernel declarations inside the KERNEL ifdef, and removed
include of <sys/queue.h> in the !KERNEL case. The prerequisites for <ufs/ufs/quota.h> were broken in Lite2 by converting some of the kernel declarations to use queue macros without including <sys/queue.h>. <sys/queue.h> was included in applications in /usr/src instead. We polluted this file instead of merging the changes in the applications. Include <sys/queue.h> in the KERNEL case, and forward-declare all structs that are used in prototypes, so that this file is almost self-sufficient even in the kernel. Obtained from: mostly from NetBSD
This commit is contained in:
parent
12d9948ac8
commit
fdc79256c1
1 changed files with 7 additions and 7 deletions
|
|
@ -34,16 +34,12 @@
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)quota.h 8.3 (Berkeley) 8/19/94
|
||||
* $Id: quota.h,v 1.11 1997/07/13 15:43:54 bde Exp $
|
||||
* $Id: quota.h,v 1.12 1999/03/05 09:28:33 bde Exp $
|
||||
*/
|
||||
|
||||
#ifndef _UFS_UFS_QUOTA_H_
|
||||
#define _UFS_UFS_QUOTA_H_
|
||||
|
||||
#ifndef KERNEL
|
||||
#include <sys/queue.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Definitions for disk quotas imposed on the average user
|
||||
* (big brother finally hits UNIX).
|
||||
|
|
@ -112,6 +108,10 @@ struct dqblk {
|
|||
time_t dqb_itime; /* time limit for excessive files */
|
||||
};
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
#include <sys/queue.h>
|
||||
|
||||
/*
|
||||
* The following structure records disk usage for a user or group on a
|
||||
* filesystem. There is one allocated for each quota that exists on any
|
||||
|
|
@ -172,10 +172,10 @@ struct dquot {
|
|||
#define DQREF(dq) (dq)->dq_cnt++
|
||||
#endif
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
struct inode;
|
||||
struct mount;
|
||||
struct proc;
|
||||
struct ucred;
|
||||
struct vnode;
|
||||
|
||||
int chkdq __P((struct inode *, long, struct ucred *, int));
|
||||
|
|
|
|||
Loading…
Reference in a new issue