X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fendianness.h;h=584b62178769ce80cc9fe593e2ef63f236c5ab15;hp=0a0728722d1e3d3a408644317a61583a23e49b05;hb=7231431086332de22b2556477bcc5fc2c3e4bdcf;hpb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2

diff --git a/src/endianness.h b/src/endianness.h
index 0a072872..584b6217 100644
--- a/src/endianness.h
+++ b/src/endianness.h
@@ -29,7 +29,7 @@ static inline uint32_t bswap32(uint32_t n)
 #ifndef bswap64
 static inline uint64_t bswap64(uint64_t n)
 {
-#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 	return __builtin_bswap64(n);
 #else
 	return (n << 56) | ((n & 0xff00) << 40) | ((n & 0xff0000) << 24) |
@@ -59,28 +59,29 @@ static inline uint64_t bswap64(uint64_t n)
 #	endif
 #endif
 
-static inline void array_cpu_to_le32(uint32_t *p, uint64_t n)
+static inline void array_cpu_to_le32(uint32_t *p, size_t n)
 {
-	while (n--)
-		*p++ = cpu_to_le32(*p);
+	for (size_t i = 0; i < n; i++)
+		p[i] = cpu_to_le32(p[i]);
 }
 
-static inline void array_le32_to_cpu(uint32_t *p, uint64_t n)
+static inline void array_le32_to_cpu(uint32_t *p, size_t n)
 {
-	while (n--)
-		*p++ = le32_to_cpu(*p);
+	for (size_t i = 0; i < n; i++)
+		p[i] = le32_to_cpu(p[i]);
 }
 
-static inline void array_cpu_to_le64(uint64_t *p, uint64_t n)
+static inline void array_cpu_to_le64(uint64_t *p, size_t n)
 {
-	while (n--)
-		*p++ = cpu_to_le64(*p);
+	for (size_t i = 0; i < n; i++)
+		p[i] = cpu_to_le64(p[i]);
 }
 
-static inline void array_le64_to_cpu(uint64_t *p, uint64_t n)
+static inline void array_le64_to_cpu(uint64_t *p, size_t n)
 {
-	while (n--)
-		*p++ = le64_to_cpu(*p);
+	for (size_t i = 0; i < n; i++)
+		p[i] = le64_to_cpu(p[i]);
 }
 
+
 #endif /* _WIMLIB_ENDIANNESS_H */