commit e2c81040bf2be672f120c87b2045af16ff21c93a
author Daniel Gollub <daniel.gollub@gmail.com> Thu May 01 14:07:03 2014 +0200
committer Jens Axboe <axboe@fb.com> Thu May 01 11:21:53 2014 -0600
tree 93af3acff44e9c0cee2bb7b9668de0282136151b
parent 9195552e8fca86b682a86fc7ab0fb6eacb433f16

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>

fio.h

diff --git a/fio.h b/fio.h
index ed034cb..4d4af0a 100644
--- a/fio.h
+++ b/fio.h
@@ -618,7 +618,9 @@
 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,