ChangeLog, bitops.h, ext2fs.h, icount.c, version.c:

bitops.h: Don't try to do i386 inline asm functions if the compiler
  	isn't GCC.
  ext2fs.h: If EXT2_FLAT_INCLUDES is defined, #include e2_types.h,
  	instead of linux/types.h, and e2_bitops.h instead of ext2fs/bitops.h.
  icount.c, version.c: Don't #include <et/com_err.h>, as it isn't necessary.

lib/ext2fs/ChangeLog

@@ -1,3 +1,15 @@
+Sun Feb  1 08:20:24 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* bitops.h: Don't try to do i386 inline asm functions if the
+ 		compiler isn't GCC.
+
+	* ext2fs.h: If EXT2_FLAT_INCLUDES is defined, #include e2_types.h,
+ 		instead of linux/types.h, and e2_bitops.h instead of
+ 		ext2fs/bitops.h.
+
+	* icount.c, version.c: Don't #include <et/com_err.h>, as it isn't
+		necessary. 
+
 Sat Jan 17 13:13:31 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* inode.c (ext2fs_open_inode_scan): Initialize the group variables

lib/ext2fs/bitops.h

@@ -85,8 +85,9 @@ extern void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map);
  * inline.c
  */
 #ifdef NO_INLINE_FUNCS
-#if (defined(__i386__) || defined(__i486__) || defined(__i586__) || \
-     defined(__mc68000__) || defined(__sparc__))
+#if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || \
+			   defined(__i586__) || defined(__mc68000__) || \
+			   defined(__sparc__)))
 	/* This prevents bitops.c from trying to include the C */
 	/* function version of these functions */
 #define _EXT2_HAVE_ASM_BITOPS_
@@ -100,7 +101,8 @@ extern void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map);
 #define _INLINE_ extern __inline__
 #endif
 
-#if (defined(__i386__) || defined(__i486__) || defined(__i586__))
+#if ((defined __GNUC__) && (defined(__i386__) || defined(__i486__) || \
+			    defined(__i586__)))
 
 #define _EXT2_HAVE_ASM_BITOPS_
 	

lib/ext2fs/ext2fs.h

@@ -37,7 +37,12 @@
 #endif
 
 #include <stdlib.h>
+
+#if EXT2_FLAT_INCLUDES
+#include "e2_types.h"
+#else
 #include <linux/types.h>
+#endif
 
 typedef __u32		blk_t;
 typedef unsigned int	dgrp_t;
@@ -187,7 +192,11 @@ struct struct_ext2_filsys {
 	struct ext2_inode_cache		*icache;
 };
 
+#if EXT2_FLAT_INCLUDES
+#include "e2_bitops.h"
+#else
 #include "ext2fs/bitops.h"
+#endif
 
 /*
  * Return flags for the block iterator functions

lib/ext2fs/icount.c

@@ -9,7 +9,6 @@
  * %End-Header%
  */
 
-#include <et/com_err.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

lib/ext2fs/version.c

@@ -9,7 +9,6 @@
  * %End-Header%
  */
 
-#include <et/com_err.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif