diff options
| author | bde <bde@FreeBSD.org> | 2000-01-01 14:43:20 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2000-01-01 14:43:20 +0000 |
| commit | a5e8250f8cd3d7d14638c62ec2b7337f4a4b34da (patch) | |
| tree | 46ea4cf85cc20dafb426252282477c2bc3757a9a /sys/gnu/fs/ext2fs/ext2_inode_cnv.c | |
| parent | 3a5569cf048ed1771b7c5b4764b52be8f1a15a14 (diff) | |
| download | FreeBSD-src-a5e8250f8cd3d7d14638c62ec2b7337f4a4b34da.zip FreeBSD-src-a5e8250f8cd3d7d14638c62ec2b7337f4a4b34da.tar.gz | |
Use an ifdef in ext2_fs.h instead of a bogus separate file (ext2_fs_i.h)
to avoid the namespace problems caused by <ufs/ufs/inode.h> #defining
i_mode, etc.
ext2_fs_i.h had nothing to do with the Linux version. It was a small
part of the Linux version of ext2_fs.h (the part that declares extra
in-core fields for an inode). We don't need it because we use the
ufs in-core inode for the extra fields.
Diffstat (limited to 'sys/gnu/fs/ext2fs/ext2_inode_cnv.c')
| -rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c index f97e8d3..ab8ceb1 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode_cnv.c +++ b/sys/gnu/fs/ext2fs/ext2_inode_cnv.c @@ -19,6 +19,7 @@ * improvements that they make and grant CSL redistribution rights. * * Utah $Hdr$ + * $FreeBSD$ */ /* @@ -33,7 +34,10 @@ #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> -/* these defs would destroy the ext2_fs_i #include */ +/* + * Undo the definitions in <ufs/ufs/inode.h> that would destroy the include + * of <gnu/ext2fs/ext2_fs.h>. + */ #undef i_atime #undef i_blocks #undef i_ctime @@ -52,7 +56,6 @@ #include <gnu/ext2fs/ext2_fs.h> #include <gnu/ext2fs/ext2_extern.h> -#include <gnu/ext2fs/ext2_fs_i.h> void ext2_print_dinode( di ) |
