From: Daniel Gollub <daniel.gollub@gmail.com>
Date: Thu, 1 May 2014 12:07:04 +0000 (+0200)
Subject: Avoid double declaration of leXX_to_cpu
X-Git-Tag: fio-2.1.9~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0bbe46e7051d1ff9469ff9d021656793c6f3c4c2;p=fio.git

Avoid double declaration of leXX_to_cpu

for external ioengines. leXX_to_cpu is a very common
declaration - e.g. Ceph is using this as well.

Signed-off-by: Daniel Gollub <daniel.gollub@gmail.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/os/os.h b/os/os.h
index 98b45321..b8eee66a 100644
--- a/os/os.h
+++ b/os/os.h
@@ -200,6 +200,7 @@ static inline uint64_t fio_swap64(uint64_t val)
 #endif
 #endif /* FIO_HAVE_BYTEORDER_FUNCS */
 
+#ifdef FIO_INTERNAL
 #define le16_to_cpu(val) ({			\
 	__le16_to_cpu(val);			\
 })
@@ -209,6 +210,8 @@ static inline uint64_t fio_swap64(uint64_t val)
 #define le64_to_cpu(val) ({			\
 	__le64_to_cpu(val);				\
 })
+#endif
+
 #define cpu_to_le16(val) ({			\
 	__cpu_to_le16(val);			\
 })