diff options
| -rw-r--r-- | lib/libkvm/kvm_file.c | 3 | ||||
| -rw-r--r-- | sys/sys/file.h | 4 | ||||
| -rw-r--r-- | usr.bin/fstat/fstat.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/libkvm/kvm_file.c b/lib/libkvm/kvm_file.c index 36990d55e8b6..024ccb2ffe70 100644 --- a/lib/libkvm/kvm_file.c +++ b/lib/libkvm/kvm_file.c @@ -46,9 +46,8 @@ static char sccsid[] = "@(#)kvm_file.c 8.1 (Berkeley) 6/4/93"; #include <sys/param.h> #include <sys/user.h> #include <sys/proc.h> -#define _KERNEL +#define _WANT_FILE /* make file.h give us 'struct file' */ #include <sys/file.h> -#undef _KERNEL #include <sys/stat.h> #include <sys/ioctl.h> #include <nlist.h> diff --git a/sys/sys/file.h b/sys/sys/file.h index 3b054404d6ac..b2a6820c333e 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -97,7 +97,9 @@ struct fileops { #define DFLAG_PASSABLE 0x01 /* may be passed via unix sockets. */ #define DFLAG_SEEKABLE 0x02 /* seekable / nonsequential */ +#endif /* _KERNEL */ +#if defined(_KERNEL) || defined(_WANT_FILE) /* * Kernel descriptor table. * One entry for each open kernel vnode and socket. @@ -137,7 +139,7 @@ struct file { #define FOFFSET_LOCKED 0x1 #define FOFFSET_LOCK_WAITING 0x2 -#endif /* _KERNEL */ +#endif /* _KERNEL || _WANT_FILE */ /* * Userland version of struct file, for sysctl diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c index 0907c49dcbf6..29ad65fb7c22 100644 --- a/usr.bin/fstat/fstat.c +++ b/usr.bin/fstat/fstat.c @@ -60,10 +60,11 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/filedesc.h> #include <sys/queue.h> +#define _WANT_FILE +#include <sys/file.h> #define _KERNEL #include <sys/pipe.h> #include <sys/conf.h> -#include <sys/file.h> #include <sys/mount.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> |