From: Daniel Gollub <d.gollub@telekom.de>
Date: Wed, 16 Apr 2014 15:40:37 +0000 (+0200)
Subject: Fix redefinitions build errors/warnings
X-Git-Tag: v11.0.1~218^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=39306617b93a104b4b0563ceb762b5be98041217;p=ceph-ci.git

Fix redefinitions build errors/warnings

due to not third-party include-safe fio.h

Signed-off-by: Daniel Gollub <daniel.gollub@gmail.com>
---

diff --git a/src/test/fio_ceph_filestore.cc b/src/test/fio_ceph_filestore.cc
index 3c5a55eeb79..fc7c360c4fa 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 {