Build lib/ext2fs/ext2_err.h early to avoid parallel build problems

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

diff --git a/lib/ext2fs/bitops.c b/lib/ext2fs/bitops.c
index 0dc8967..9c34847 100644 (file)
--- a/lib/ext2fs/bitops.c
+++ b/lib/ext2fs/bitops.c
@@ -2,17 +2,20 @@
  * bitops.c --- Bitmap frobbing code.  See bitops.h for the inlined
  *     routines.
  * 
- * Copyright (C) 1993, 1994 Theodore Ts'o.  This file may be
- * redistributed under the terms of the GNU Public License.
- * 
- * Taken from <asm/bitops.h>, Copyright 1992, Linus Torvalds.
+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
+ *
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
  */
 
 #include <stdio.h>
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
 #ifndef _EXT2_HAVE_ASM_BITOPS_
@@ -27,38 +30,38 @@
  * systems, as well as non-32 bit systems.
  */
 
-int set_bit(int nr,void * addr)
+int ext2fs_set_bit(unsigned int nr,void * addr)
 {
        int             mask, retval;
        unsigned char   *ADDR = (unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       retval = (mask & *ADDR) != 0;
+       retval = mask & *ADDR;
        *ADDR |= mask;
        return retval;
 }
 
-int clear_bit(int nr, void * addr)
+int ext2fs_clear_bit(unsigned int nr, void * addr)
 {
        int             mask, retval;
        unsigned char   *ADDR = (unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       retval = (mask & *ADDR) != 0;
+       retval = mask & *ADDR;
        *ADDR &= ~mask;
        return retval;
 }
 
-int test_bit(int nr, const void * addr)
+int ext2fs_test_bit(unsigned int nr, const void * addr)
 {
        int                     mask;
        const unsigned char     *ADDR = (const unsigned char *) addr;
 
        ADDR += nr >> 3;
        mask = 1 << (nr & 0x07);
-       return ((mask & *ADDR) != 0);
+       return (mask & *ADDR);
 }
 
 #endif /* !_EXT2_HAVE_ASM_BITOPS_ */
@@ -66,9 +69,10 @@ int test_bit(int nr, const void * addr)
 void ext2fs_warn_bitmap(errcode_t errcode, unsigned long arg,
                        const char *description)
 {
+#ifndef OMIT_COM_ERR
        if (description)
-               com_err(0, errcode, "#%u for %s", arg, description);
+               com_err(0, errcode, "#%lu for %s", arg, description);
        else
-               com_err(0, errcode, "#%u", arg);
+               com_err(0, errcode, "#%lu", arg);
+#endif
 }
-