LU-8036 utils: remove ARRAY_SIZE() define from lustreapi.h

Remove the definition of ARRAY_SIZE() from lustreapi.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I57b1893e7ecd57d841f5b9348a8d5285cbc02124
Reviewed-on: http://review.whamcloud.com/19818
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>

diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h
index 3f0cf97..e67d859 100644 (file)
--- a/lustre/include/lustre/lustreapi.h
+++ b/lustre/include/lustre/lustreapi.h
@@ -46,8 +46,6 @@
 #include <stdint.h>
 #include <lustre/lustre_user.h>
 
-#define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
-
 extern bool liblustreapi_initialized;
 
 

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index bcc1963..14a84a9 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -75,6 +75,10 @@
 #include <lustre_ver.h>
 #include <lustre_param.h>
 
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
+#endif /* !ARRAY_SIZE */
+
 /* all functions */
 static int lfs_setstripe(int argc, char **argv);
 static int lfs_find(int argc, char **argv);

diff --git a/lustre/utils/req-layout.c b/lustre/utils/req-layout.c
index 3a975e7..74997cb 100644 (file)
--- a/lustre/utils/req-layout.c
+++ b/lustre/utils/req-layout.c
@@ -56,6 +56,10 @@
 #include <lustre_req_layout.h>
 #include <lustre/lustreapi.h>
 
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
+#endif /* !ARRAY_SIZE */
+
 #define lustre_swab_generic_32s NULL
 #define lustre_swab_lu_seq_range NULL
 #define lustre_swab_mdt_body NULL