From a5e8250f8cd3d7d14638c62ec2b7337f4a4b34da Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 1 Jan 2000 14:43:20 +0000
Subject: 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.
---
 sys/gnu/fs/ext2fs/ext2_inode_cnv.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'sys/gnu/fs/ext2fs/ext2_inode_cnv.c')

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 )
-- 
cgit v1.1