From 39306617b93a104b4b0563ceb762b5be98041217 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Wed, 16 Apr 2014 17:40:37 +0200 Subject: [PATCH] Fix redefinitions build errors/warnings due to not third-party include-safe fio.h Signed-off-by: Daniel Gollub --- src/test/fio_ceph_filestore.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/fio_ceph_filestore.cc b/src/test/fio_ceph_filestore.cc index 3c5a55eeb7966..fc7c360c4fad6 100644 --- a/src/test/fio_ceph_filestore.cc +++ b/src/test/fio_ceph_filestore.cc @@ -9,7 +9,15 @@ #include "os/FileStore.h" #include "global/global_init.h" -//#include "../../fio/fio.h" +/* silence some fio.h include issues. + * fio.h needs to made robust for third-party software. + */ +#undef ARRAY_SIZE /* double declartion */ +#define CONFIG_CPU_COUNT /* double declaration: fio.h should check if CPU_COUNT alread got defined */ +#undef le16_to_cpu +#undef le32_to_cpu +#undef le64_to_cpu + #include "fio.h" struct fio_ceph_filestore_iou { -- 2.39.5