From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-2811-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 31803 invoked by alias); 23 Mar 2010 14:35:10 -0000
Received: (qmail 31789 invoked by uid 9447); 23 Mar 2010 14:35:10 -0000
Date: Tue, 23 Mar 2010 14:35:00 -0000
Message-ID: <20100323143510.31787.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/daemons/clvmd clvmd-comms.h
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-03/txt/msg00050.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2010-03-23 14:35:09

Modified files:
	daemons/clvmd  : clvmd-comms.h 

Log message:
	Avoid duplicate definitions.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-comms.h.diff?cvsroot=lvm2&r1=1.11&r2=1.12

--- LVM2/daemons/clvmd/clvmd-comms.h	2010/03/18 09:19:31	1.11
+++ LVM2/daemons/clvmd/clvmd-comms.h	2010/03/23 14:35:08	1.12
@@ -112,9 +112,13 @@
 
 #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