Stop force-inlining everything marked 'inline'

[wimlib] / include / wimlib / lz_extend.h

diff --git a/include/wimlib/lz_extend.h b/include/wimlib/lz_extend.h
index c4547e2bc6d9d046e7aebc35ee765eae40db9342..26f0ce5cd11be42f76bbee3508d16e6c119d9772 100644 (file)
--- a/include/wimlib/lz_extend.h
+++ b/include/wimlib/lz_extend.h
@@ -28,7 +28,7 @@
  * Return the number of bytes at @matchptr that match the bytes at @strptr, up
  * to a maximum of @max_len.  Initially, @len bytes are matched.
  */
-static inline u32
+static forceinline u32
 lz_extend(const u8 * const strptr, const u8 * const matchptr,
          u32 len, const u32 max_len)
 {
@@ -37,9 +37,9 @@ lz_extend(const u8 * const strptr, const u8 * const matchptr,
                                   load_word_unaligned(strptr + len);
                if (v != 0) {
                        if (CPU_IS_LITTLE_ENDIAN)
-                               len += ffsw(v) >> 3;
+                               len += bsfw(v) >> 3;
                        else
-                               len += (WORDBITS - 1 - flsw(v)) >> 3;
+                               len += (WORDBITS - 1 - bsrw(v)) >> 3;
                        return len;
                }
                len += WORDBYTES;