summaryrefslogtreecommitdiffstats
path: root/sys/ufs
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
committerpeter <peter@FreeBSD.org>1999-12-29 05:07:58 +0000
commitd53e4c1d809338e9b317d95bdded2f7f7a986556 (patch)
tree916004bdaa3cf47d2a92effe8c981e7d1ff5ccec /sys/ufs
parent15b9bcb121e1f3735a2c98a11afdb52a03301d7e (diff)
downloadFreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.zip
FreeBSD-src-d53e4c1d809338e9b317d95bdded2f7f7a986556.tar.gz
Change #ifdef KERNEL to #ifdef _KERNEL in the public headers. "KERNEL"
is an application space macro and the applications are supposed to be free to use it as they please (but cannot). This is consistant with the other BSD's who made this change quite some time ago. More commits to come.
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ffs/ffs_subr.c2
-rw-r--r--sys/ufs/ufs/inode.h4
-rw-r--r--sys/ufs/ufs/quota.h6
-rw-r--r--sys/ufs/ufs/ufsmount.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index f005c71..ee3173a 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -37,7 +37,7 @@
#include <sys/param.h>
#include <ufs/ffs/fs.h>
-#ifndef KERNEL
+#ifndef _KERNEL
#include <ufs/ufs/dinode.h>
#else
#include "opt_ddb.h"
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 78fbc0a..83960b0 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -130,7 +130,7 @@ struct inode {
#define IN_HASHED 0x0080 /* Inode is on hash list */
#define IN_LAZYMOD 0x0100 /* Modified, but don't write yet. */
-#ifdef KERNEL
+#ifdef _KERNEL
/*
* Structure used to pass around logical block paths generated by
* ufs_getlbns and used by truncate and bmap code.
@@ -156,6 +156,6 @@ struct ufid {
ino_t ufid_ino; /* File number (ino). */
int32_t ufid_gen; /* Generation number. */
};
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_INODE_H_ */
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index f449a1a..f8299ee 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -108,7 +108,7 @@ struct dqblk {
time_t dqb_itime; /* time limit for excessive files */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#include <sys/queue.h>
@@ -191,7 +191,7 @@ int setquota __P((struct mount *, u_long, int, caddr_t));
int setuse __P((struct mount *, u_long, int, caddr_t));
int ufs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-#else /* !KERNEL */
+#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -199,6 +199,6 @@ __BEGIN_DECLS
int quotactl __P((const char *, int, int, void *));
__END_DECLS
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif /* !_UFS_UFS_QUOTA_H_ */
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 05f19da..0652545 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -55,7 +55,7 @@ struct mfs_args {
u_long size; /* size of file system */
};
-#ifdef KERNEL
+#ifdef _KERNEL
#ifdef MALLOC_DECLARE
MALLOC_DECLARE(M_UFSMNT);
@@ -125,6 +125,6 @@ struct ufsmount {
#define MNINDIR(ump) ((ump)->um_nindir)
#define blkptrtodb(ump, b) ((b) << (ump)->um_bptrtodb)
#define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
-#endif /* KERNEL */
+#endif /* _KERNEL */
#endif
OpenPOWER on IntegriCloud