X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Fdecompress_common.h;h=54241b36592495106ff7d2efc5970e3d84b52c20;hb=a82a0fbc625a96aabd2a11e79fb6aedf1fe313b3;hp=5d7c4e5abb441ce5e3fe625869c673d1a4b4b234;hpb=c24f1c029572b67c7023aa06a7c24a46cf938367;p=wimlib

diff --git a/include/wimlib/decompress_common.h b/include/wimlib/decompress_common.h
index 5d7c4e5a..54241b36 100644
--- a/include/wimlib/decompress_common.h
+++ b/include/wimlib/decompress_common.h
@@ -67,7 +67,7 @@ bitstream_ensure_bits(struct input_bitstream *is, const unsigned num_bits)
 	if (unlikely(is->end - is->next < 2))
 		goto overflow;
 
-	is->bitbuf |= (u32)get_unaligned_u16_le(is->next) << (16 - is->bitsleft);
+	is->bitbuf |= (u32)get_unaligned_le16(is->next) << (16 - is->bitsleft);
 	is->next += 2;
 	is->bitsleft += 16;
 
@@ -75,7 +75,7 @@ bitstream_ensure_bits(struct input_bitstream *is, const unsigned num_bits)
 		if (unlikely(is->end - is->next < 2))
 			goto overflow;
 
-		is->bitbuf |= (u32)get_unaligned_u16_le(is->next);
+		is->bitbuf |= (u32)get_unaligned_le16(is->next);
 		is->next += 2;
 		is->bitsleft = 32;
 	}
@@ -141,7 +141,7 @@ bitstream_read_u16(struct input_bitstream *is)
 
 	if (unlikely(is->end - is->next < 2))
 		return 0;
-	v = get_unaligned_u16_le(is->next);
+	v = get_unaligned_le16(is->next);
 	is->next += 2;
 	return v;
 }
@@ -154,7 +154,7 @@ bitstream_read_u32(struct input_bitstream *is)
 
 	if (unlikely(is->end - is->next < 4))
 		return 0;
-	v = get_unaligned_u32_le(is->next);
+	v = get_unaligned_le32(is->next);
 	is->next += 4;
 	return v;
 }
@@ -299,7 +299,7 @@ lz_copy(u8 *dst, u32 length, u32 offset, const u8 *winend, u32 min_length)
 	 * beyond the end of the output buffer, hence the check for (winend -
 	 * end >= WORDSIZE - 1).
 	 */
-	if (UNALIGNED_ACCESS_IS_VERY_FAST &&
+	if (UNALIGNED_ACCESS_IS_FAST &&
 	    likely(winend - end >= WORDSIZE - 1))
 	{