From mboxrd@z Thu Jan  1 00:00:00 1970
From: teigland@sourceware.org <teigland@sourceware.org>
Date: 26 Oct 2007 21:23:50 -0000
Subject: [Cluster-devel] cluster/dlm/tool main.c
Message-ID: <20071026212350.26802.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	teigland at sourceware.org	2007-10-26 21:23:50

Modified files:
	dlm/tool       : main.c 

Log message:
	xid needs to be unsigned long long
	#endif on wrong line from last commit

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/tool/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.8&r2=1.2.2.9

--- cluster/dlm/tool/main.c	2007/10/26 20:57:55	1.2.2.8
+++ cluster/dlm/tool/main.c	2007/10/26 21:23:49	1.2.2.9
@@ -316,7 +316,7 @@
 	int r_len;
 	int rv;
 	unsigned int time;
-	uint64_t	xid;
+	unsigned long long xid;
 	uint32_t	id;
 	int		nodeid;
 	uint32_t	remid;
@@ -479,8 +479,8 @@
 	case OP_DEADLOCK_CHECK:
 		do_deadlock_check(lsname);
 		break;
-	}
 #endif
+	}
 	return 0;
 }