Remove WINDOWS_LDADD

[wimlib] / include / wimlib / endianness.h

diff --git a/include/wimlib/endianness.h b/include/wimlib/endianness.h
index 2d1e9a672916dec488e6b307c324a608e2482526..4c1b239fc780a65646bad3dea43ba9938520432c 100644 (file)
--- a/include/wimlib/endianness.h
+++ b/include/wimlib/endianness.h
@@ -38,48 +38,34 @@ bswap64(u64 n)
 }
 
 #  ifdef WORDS_BIGENDIAN
-#    define le16_to_cpu(n) bswap16(n)
-#    define le32_to_cpu(n) bswap32(n)
-#    define le64_to_cpu(n) bswap64(n)
-#    define cpu_to_le16(n) bswap16(n)
-#    define cpu_to_le32(n) bswap32(n)
-#    define cpu_to_le64(n) bswap64(n)
+#    define cpu_to_le16(n) ((_force_attr le16)bswap16(n))
+#    define cpu_to_le32(n) ((_force_attr le32)bswap32(n))
+#    define cpu_to_le64(n) ((_force_attr le64)bswap64(n))
+#    define le16_to_cpu(n) bswap16((_force_attr u16)(le16)(n))
+#    define le32_to_cpu(n) bswap32((_force_attr u32)(le32)(n))
+#    define le64_to_cpu(n) bswap64((_force_attr u64)(le64)(n))
+
+#    define cpu_to_be16(n) ((_force_attr be16)(u16)(n))
+#    define cpu_to_be32(n) ((_force_attr be32)(u32)(n))
+#    define cpu_to_be64(n) ((_force_attr be64)(u64)(n))
+#    define be16_to_cpu(n) ((_force_attr u16)(be16)(n))
+#    define be32_to_cpu(n) ((_force_attr u32)(be32)(n))
+#    define be64_to_cpu(n) ((_force_attr u64)(be64)(n))
 #  else
-#    define cpu_to_le16(n) (n)
-#    define cpu_to_le32(n) (n)
-#    define cpu_to_le64(n) (n)
-#    define le16_to_cpu(n) (n)
-#    define le32_to_cpu(n) (n)
-#    define le64_to_cpu(n) (n)
+#    define cpu_to_le16(n) ((_force_attr le16)(u16)(n))
+#    define cpu_to_le32(n) ((_force_attr le32)(u32)(n))
+#    define cpu_to_le64(n) ((_force_attr le64)(u64)(n))
+#    define le16_to_cpu(n) ((_force_attr u16)(le16)(n))
+#    define le32_to_cpu(n) ((_force_attr u32)(le32)(n))
+#    define le64_to_cpu(n) ((_force_attr u64)(le64)(n))
+
+#    define cpu_to_be16(n) ((_force_attr be16)bswap16(n))
+#    define cpu_to_be32(n) ((_force_attr be32)bswap32(n))
+#    define cpu_to_be64(n) ((_force_attr be64)bswap64(n))
+#    define be16_to_cpu(n) bswap16((_force_attr u16)(be16)(n))
+#    define be32_to_cpu(n) bswap32((_force_attr u32)(be32)(n))
+#    define be64_to_cpu(n) bswap64((_force_attr u64)(be64)(n))
 #  endif
 #endif /* _NTFS_ENDIANS_H */
 
-static inline void
-array_cpu_to_le32(u32 *p, size_t n)
-{
-       for (size_t i = 0; i < n; i++)
-               p[i] = cpu_to_le32(p[i]);
-}
-
-static inline void
-array_le32_to_cpu(u32 *p, size_t n)
-{
-       for (size_t i = 0; i < n; i++)
-               p[i] = le32_to_cpu(p[i]);
-}
-
-static inline void
-array_cpu_to_le64(u64 *p, size_t n)
-{
-       for (size_t i = 0; i < n; i++)
-               p[i] = cpu_to_le64(p[i]);
-}
-
-static inline void
-array_le64_to_cpu(u64 *p, size_t n)
-{
-       for (size_t i = 0; i < n; i++)
-               p[i] = le64_to_cpu(p[i]);
-}
-
 #endif /* _WIMLIB_ENDIANNESS_H */