Rename WORDSIZE to WORDBYTES and introduce WORDBITS

[wimlib] / include / wimlib / bitops.h

diff --git a/include/wimlib/bitops.h b/include/wimlib/bitops.h
index 70e6c611a888c68feb76ddbb627c57a4d2b89c54..ed8b16cdd2410b1d5649081bc3758938d27dd074 100644 (file)
--- a/include/wimlib/bitops.h
+++ b/include/wimlib/bitops.h
@@ -55,8 +55,8 @@ fls64(u64 v)
 static inline unsigned
 flsw(machine_word_t v)
 {
-       STATIC_ASSERT(WORDSIZE == 4 || WORDSIZE == 8);
-       if (WORDSIZE == 4)
+       STATIC_ASSERT(WORDBITS == 32 || WORDBITS == 64);
+       if (WORDBITS == 32)
                return fls32(v);
        else
                return fls64(v);
@@ -93,8 +93,8 @@ ffs64(u64 v)
 static inline unsigned
 ffsw(machine_word_t v)
 {
-       STATIC_ASSERT(WORDSIZE == 4 || WORDSIZE == 8);
-       if (WORDSIZE == 4)
+       STATIC_ASSERT(WORDBITS == 32 || WORDBITS == 64);
+       if (WORDBITS == 32)
                return ffs32(v);
        else
                return ffs64(v);