X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fbyte_conversions.h;h=2e4cafe901f5ff7cd20e8455fa6ae7f53bf2fa7f;hb=96f1edbae1ed41ec1c4e558060b7b33b6b749ea4;hp=84e9e2debcd338a2416e8e2bf6c5f0777d015077;hpb=bc1784a2103d884f85a448af856d5c6254583979;p=hivex.git

diff --git a/lib/byte_conversions.h b/lib/byte_conversions.h
index 84e9e2d..2e4cafe 100644
--- a/lib/byte_conversions.h
+++ b/lib/byte_conversions.h
@@ -18,22 +18,20 @@
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
 #endif
-#ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
-#endif
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #ifndef be32toh
-#define be32toh(x) __bswap_32 (x)
+#define be32toh(x) bswap_32 (x)
 #endif
 #ifndef htobe32
-#define htobe32(x) __bswap_32 (x)
+#define htobe32(x) bswap_32 (x)
 #endif
 #ifndef be64toh
-#define be64toh(x) __bswap_64 (x)
+#define be64toh(x) bswap_64 (x)
 #endif
 #ifndef htobe64
-#define htobe64(x) __bswap_64 (x)
+#define htobe64(x) bswap_64 (x)
 #endif
 #ifndef le16toh
 #define le16toh(x) (x)
@@ -67,22 +65,22 @@
 #define htobe64(x) (x)
 #endif
 #ifndef le16toh
-#define le16toh(x) __bswap_16 (x)
+#define le16toh(x) bswap_16 (x)
 #endif
 #ifndef htole16
-#define htole16(x) __bswap_16 (x)
+#define htole16(x) bswap_16 (x)
 #endif
 #ifndef le32toh
-#define le32toh(x) __bswap_32 (x)
+#define le32toh(x) bswap_32 (x)
 #endif
 #ifndef htole32
-#define htole32(x) __bswap_32 (x)
+#define htole32(x) bswap_32 (x)
 #endif
 #ifndef le64toh
-#define le64toh(x) __bswap_64 (x)
+#define le64toh(x) bswap_64 (x)
 #endif
 #ifndef htole64
-#define htole64(x) __bswap_64 (x)
+#define htole64(x) bswap_64 (x)
 #endif
 #endif /* __BYTE_ORDER == __BIG_ENDIAN */