From mboxrd@z Thu Jan  1 00:00:00 1970
From: fabbione@sourceware.org <fabbione@sourceware.org>
Date: 30 Dec 2007 08:27:22 -0000
Subject: [Cluster-devel] cluster/rgmanager ChangeLog include/resgroup.h ...
Message-ID: <20071230082722.10005.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
Changes by:	fabbione at sourceware.org	2007-12-30 08:27:21

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/include: resgroup.h 
	rgmanager/src/clulib: alloc.c 
	rgmanager/src/daemons: rg_state.c 

Log message:
	Fix building when -DDEBUG is defined.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.69&r2=1.70
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/include/resgroup.h.diff?cvsroot=cluster&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/alloc.c.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&r1=1.43&r2=1.44

--- cluster/rgmanager/ChangeLog	2007/12/24 05:26:42	1.69
+++ cluster/rgmanager/ChangeLog	2007/12/30 08:27:21	1.70
@@ -1,3 +1,7 @@
+2007-12-30 Fabio M. Di Nitto <fabbione@ubuntu.com>
+	* src/daemons/rg_state.c, include/resgroup.h, src/clulib/alloc.c:
+	  Fix building when -DDEBUG is defined.
+
 2007-12-24 Fabio M. Di Nitto <fabbione@ubuntu.com>
 	* src/clulib/vft.c: Change ifdef to fix build on parisc.
 
--- cluster/rgmanager/include/resgroup.h	2007/12/14 19:37:00	1.26
+++ cluster/rgmanager/include/resgroup.h	2007/12/30 08:27:21	1.27
@@ -186,7 +186,7 @@
 #define rg_lock(name, p) _rg_lock_dbg(name, p, __FILE__, __LINE__)
 
 int _rg_unlock_dbg(struct dlm_lksb *, char *, int);
-#define rg_unlock(name, p) _rg_unlock_dbg(name, p, __FILE__, __LINE__)
+#define rg_unlock(p) _rg_unlock_dbg(p, __FILE__, __LINE__)
 
 #else
 int rg_lock(char *name, struct dlm_lksb *p);
--- cluster/rgmanager/src/clulib/alloc.c	2007/08/09 09:22:24	1.12
+++ cluster/rgmanager/src/clulib/alloc.c	2007/12/30 08:27:21	1.13
@@ -116,10 +116,12 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#if !defined(__ia64__) && !defined(__hppa__)
 #ifndef DEBUG
 #define DEBUG			/* Record program counter of malloc/calloc */
 #endif				/* or realloc call; print misc stuff out */
+
+#if defined(__ia64__) || defined(__hppa__)
+#undef DEBUG
 #endif
 
 /* Tunable stuff XXX This should be external */
--- cluster/rgmanager/src/daemons/rg_state.c	2007/12/14 19:37:00	1.43
+++ cluster/rgmanager/src/daemons/rg_state.c	2007/12/30 08:27:21	1.44
@@ -195,7 +195,6 @@
 	return _rg_lock(name, p);
 }
 #endif
-	
 
 
 int
@@ -211,7 +210,7 @@
 
 #ifdef DEBUG
 int
-_rg_unlock_dbg(void *p, char *file, int line)
+_rg_unlock_dbg(struct dlm_lksb *p, char *file, int line)
 {
 	dprintf("rg_unlock() @ %s:%d\n", file, line);
 	return _rg_unlock(p);