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

Avoid double-declaration of ARRAY_SIZE

for external ioengines. ARRAY_SIZE 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/fio.h b/fio.h
index ed034cbb..4d4af0a7 100644
--- a/fio.h
+++ b/fio.h
@@ -618,7 +618,9 @@ static inline void td_io_u_free_notify(struct thread_data *td)
 extern const char *fio_get_arch_string(int);
 extern const char *fio_get_os_string(int);
 
+#ifdef FIO_INTERNAL
 #define ARRAY_SIZE(x) (sizeof((x)) / (sizeof((x)[0])))
+#endif
 
 enum {
 	FIO_OUTPUT_TERSE	= 0,