ChangeLog, openfs.c:

[tools/e2fsprogs.git] / lib / ext2fs / bitops.h

diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h
index a20d395..0361d9b 100644 (file)
--- a/lib/ext2fs/bitops.h
+++ b/lib/ext2fs/bitops.h
@@ -75,6 +75,7 @@ extern void ext2fs_fast_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
                                                  blk_t block, int num);
 extern int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
                                               blk_t block, int num);
+extern void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map);
 
 /*
  * The inline routines themselves...
@@ -84,8 +85,9 @@ extern int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
  * 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_
@@ -96,10 +98,15 @@ extern int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
 #ifdef INCLUDE_INLINE_FUNCS
 #define _INLINE_ extern
 #else
+#ifdef __GNUC__
 #define _INLINE_ extern __inline__
+#else                          /* For Watcom C */
+#define _INLINE_ extern inline
+#endif
 #endif
 
-#if (defined(__i386__) || defined(__i486__) || defined(__i586__))
+#if ((defined __GNUC__) && (defined(__i386__) || defined(__i486__) || \
+                           defined(__i586__)))
 
 #define _EXT2_HAVE_ASM_BITOPS_