projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9195552
)
Avoid double-declaration of ARRAY_SIZE
author
Daniel Gollub
<daniel.gollub@gmail.com>
Thu, 1 May 2014 12:07:03 +0000
(14:07 +0200)
committer
Jens Axboe
<axboe@fb.com>
Thu, 1 May 2014 17:21:53 +0000
(11:21 -0600)
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
patch
|
blob
|
blame
|
history
diff --git
a/fio.h
b/fio.h
index ed034cbbf909d42997445e9693ba6268cd8188aa..4d4af0a7917f12b5b666ca38ea06a038659dc3b3 100644
(file)
--- 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,