Move endian support out of server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/os/os.h b/os/os.h
index 189041f5546c20e703deaeb499683963fd5a6b1f..e1c285ce5a5152e6e7cb76af71687efd473dc845 100644 (file)
--- a/os/os.h
+++ b/os/os.h
@@ -143,6 +143,47 @@ static inline uint64_t fio_swap64(uint64_t val)
 }
 #endif
 
+#ifdef FIO_LITTLE_ENDIAN
+#define __le16_to_cpu(x)               (x)
+#define __le32_to_cpu(x)               (x)
+#define __le64_to_cpu(x)               (x)
+#define __cpu_to_le16(x)               (x)
+#define __cpu_to_le32(x)               (x)
+#define __cpu_to_le64(x)               (x)
+#else
+#define __le16_to_cpu(x)               fio_swap16(x)
+#define __le32_to_cpu(x)               fio_swap32(x)
+#define __le64_to_cpu(x)               fio_swap64(x)
+#define __cpu_to_le16(x)               fio_swap16(x)
+#define __cpu_to_le32(x)               fio_swap32(x)
+#define __cpu_to_le64(x)               fio_swap64(x)
+#endif
+
+#define le16_to_cpu(val) ({                    \
+       uint16_t *__val = &(val);               \
+       __le16_to_cpu(*__val);                  \
+})
+#define le32_to_cpu(val) ({                    \
+       uint32_t *__val = &(val);               \
+       __le32_to_cpu(*__val);                  \
+})
+#define le64_to_cpu(val) ({                    \
+       uint64_t *__val = &(val);               \
+       __le64_to_cpu(*__val);                  \
+})
+#define cpu_to_le16(val) ({                    \
+       uint16_t *__val = &(val);               \
+       __cpu_to_le16(*__val);                  \
+})
+#define cpu_to_le32(val) ({                    \
+       uint32_t *__val = &(val);               \
+       __cpu_to_le32(*__val);                  \
+})
+#define cpu_to_le64(val) ({                    \
+       uint64_t *__val = &(val);               \
+       __cpu_to_le64(*__val);                  \
+})
+
 #ifndef FIO_HAVE_BLKTRACE
 static inline int is_blktrace(const char *fname)
 {

diff --git a/server.h b/server.h
index b3976177ffab5078094ba37586dd8cfe113a97a2..891b3a312c2fb1ab4e2e8ec886225789a698aef2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -97,47 +97,6 @@ extern struct fio_net_cmd *fio_net_recv_cmd(int sk, int block);
 extern int exit_backend;
 extern int fio_net_port;
 
-#ifdef FIO_LITTLE_ENDIAN
-#define __le16_to_cpu(x)               (x)
-#define __le32_to_cpu(x)               (x)
-#define __le64_to_cpu(x)               (x)
-#define __cpu_to_le16(x)               (x)
-#define __cpu_to_le32(x)               (x)
-#define __cpu_to_le64(x)               (x)
-#else
-#define __le16_to_cpu(x)               fio_swap16(x)
-#define __le32_to_cpu(x)               fio_swap32(x)
-#define __le64_to_cpu(x)               fio_swap64(x)
-#define __cpu_to_le16(x)               fio_swap16(x)
-#define __cpu_to_le32(x)               fio_swap32(x)
-#define __cpu_to_le64(x)               fio_swap64(x)
-#endif
-
-#define le16_to_cpu(val) ({                    \
-       uint16_t *__val = &(val);               \
-       __le16_to_cpu(*__val);                  \
-})
-#define le32_to_cpu(val) ({                    \
-       uint32_t *__val = &(val);               \
-       __le32_to_cpu(*__val);                  \
-})
-#define le64_to_cpu(val) ({                    \
-       uint64_t *__val = &(val);               \
-       __le64_to_cpu(*__val);                  \
-})
-#define cpu_to_le16(val) ({                    \
-       uint16_t *__val = &(val);               \
-       __cpu_to_le16(*__val);                  \
-})
-#define cpu_to_le32(val) ({                    \
-       uint32_t *__val = &(val);               \
-       __cpu_to_le32(*__val);                  \
-})
-#define cpu_to_le64(val) ({                    \
-       uint64_t *__val = &(val);               \
-       __cpu_to_le64(*__val);                  \
-})
-
 static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode,
                                    const void *pdu, uint32_t pdu_len)
 {