move bswap functions to static inline in byteswap.h

diff --git a/include/byteswap.h b/include/byteswap.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..4ebd90e3806aba29f36b3984ad2c43f46bfdd6b0 100644 (file)
--- a/include/byteswap.h
+++ b/include/byteswap.h
@@ -0,0 +1,25 @@
+#ifndef _BYTESWAP_H
+#define _BYTESWAP_H
+
+#include <stdint.h>
+
+static inline uint16_t __bswap_16(uint16_t __x)
+{
+       return __x<<8 | __x>>8;
+}
+
+static inline uint32_t __bswap_32(uint32_t __x)
+{
+       return __x>>24 | __x>>8&0xff00 | __x<<8&0xff0000 | __x<<24;
+}
+
+static inline uint64_t __bswap_64(uint64_t __x)
+{
+       return __bswap_32(__x)+0ULL<<32 | __bswap_32(__x>>32);
+}
+
+#define bswap_16(x) __bswap_16(x)
+#define bswap_32(x) __bswap_32(x)
+#define bswap_64(x) __bswap_64(x)
+
+#endif

diff --git a/src/misc/bswap_32.c b/src/misc/bswap_32.c
deleted file mode 100644 (file)
index f26d411..0000000
--- a/src/misc/bswap_32.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <endian.h>
-#include <stdint.h>
-
-uint32_t bswap_32(uint32_t x)
-{
-       return x>>24 | x>>8&0xff00 | x<<8&0xff0000 | x<<24;
-}

diff --git a/src/misc/bswap_64.c b/src/misc/bswap_64.c
deleted file mode 100644 (file)
index 961300b..0000000
--- a/src/misc/bswap_64.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <endian.h>
-#include <stdint.h>
-
-uint32_t bswap_32(uint32_t);
-
-uint64_t bswap_64(uint64_t x)
-{
-       return bswap_32(x)+0LL<<32 | bswap_32(x>>32);
-}