From: Alasdair Kergon <agk@redhat.com>
Date: Tue, 23 Mar 2010 14:35:08 +0000 (+0000)
Subject: Avoid duplicate definitions.
X-Git-Tag: v2_02_91~2200
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=8b373275a25da1269369e605d9c26ff2414305fe;p=lvm2.git

Avoid duplicate definitions.
---

diff --git a/daemons/clvmd/clvmd-comms.h b/daemons/clvmd/clvmd-comms.h
index 715244cb7..fbcfe8b54 100644
--- a/daemons/clvmd/clvmd-comms.h
+++ b/daemons/clvmd/clvmd-comms.h
@@ -112,9 +112,13 @@ struct cluster_ops *init_corosync_cluster(void);
 
 #ifdef USE_SINGLENODE
 #  define SINGLENODE_CSID_LEN (sizeof(int))
-#  define MAX_CLUSTER_MEMBER_NAME_LEN       64
+#  ifndef MAX_CLUSTER_MEMBER_NAME_LEN
+#    define MAX_CLUSTER_MEMBER_NAME_LEN       64
+#  endif
 #  define SINGLENODE_MAX_CLUSTER_MESSAGE          65535
-#  define MAX_CSID_LEN sizeof(int)
+#  ifndef MAX_CSID_LEN
+#    define MAX_CSID_LEN sizeof(int)
+#  endif
 struct cluster_ops *init_singlenode_cluster(void);
 #endif