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>
#include <stdint.h>
#include <lustre/lustre_user.h>
#include <stdint.h>
#include <lustre/lustre_user.h>
-#define ARRAY_SIZE(a) ((sizeof(a)) / (sizeof((a)[0])))
-
extern bool liblustreapi_initialized;
extern bool liblustreapi_initialized;
#include <lustre_ver.h>
#include <lustre_param.h>
#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);
/* all functions */
static int lfs_setstripe(int argc, char **argv);
static int lfs_find(int argc, char **argv);
#include <lustre_req_layout.h>
#include <lustre/lustreapi.h>
#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
#define lustre_swab_generic_32s NULL
#define lustre_swab_lu_seq_range NULL
#define lustre_swab_mdt_body NULL