[Pvfs2-cvs] commit by pw in pvfs2/src/common/gossip: gossip.c gossip.h module.mk.in

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/common/gossip
In directory parlweb1:/tmp/cvs-serv22041/src/common/gossip

Modified Files:
	gossip.c gossip.h module.mk.in 
Log Message:
Always define gossip_backtrace(), just as a noop if it cannot be built.  This
simplifies some ifdef nests in a few spots.  No behavior change.


Index: gossip.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/gossip/gossip.c,v
diff -u -p -p -u -r1.26 -r1.27
--- gossip.c	13 Apr 2007 05:02:52 -0000	1.26
+++ gossip.c	22 Jul 2007 16:15:01 -0000	1.27
@@ -389,6 +389,10 @@ void gossip_backtrace(void)
     }
     free(messages);
 }
+#else
+void gossip_backtrace(void)
+{
+}
 #endif
 
 /****************************************************************

Index: gossip.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/gossip/gossip.h,v
diff -u -p -p -u -r1.24 -r1.25
--- gossip.h	12 Mar 2007 22:20:28 -0000	1.24
+++ gossip.h	22 Jul 2007 16:15:01 -0000	1.25
@@ -96,9 +96,7 @@ int gossip_get_debug_mask(
 int gossip_set_logstamp(
     enum gossip_logstamp ts);
 
-#ifdef GOSSIP_ENABLE_BACKTRACE
 void gossip_backtrace(void);
-#endif
 
 #ifdef __GNUC__
 
@@ -163,18 +161,11 @@ do {                                    
     gossip_debug(mask, "%s: " format, __func__ , ##f); \
 } while(0)
 
-#ifdef GOSSIP_ENABLE_BACKTRACE
 #define gossip_lerr(format, f...)                  \
 do {                                               \
     gossip_err("%s line %d: " format, __FILE__ , __LINE__ , ##f); \
     gossip_backtrace();                            \
 } while(0)
-#else
-#define gossip_lerr(format, f...)                  \
-do {                                               \
-    gossip_err("%s line %d: " format, __FILE__ , __LINE__ , ##f); \
-} while(0)
-#endif
 #else /* ! __GNUC__ */
 
 int __gossip_debug(

Index: module.mk.in
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/common/gossip/module.mk.in,v
diff -u -p -p -u -r1.2 -r1.3
--- module.mk.in	10 Jan 2003 02:57:26 -0000	1.2
+++ module.mk.in	22 Jul 2007 16:15:01 -0000	1.3
@@ -1,3 +1,6 @@
+GOSSIP_ENABLE_BACKTRACE = @GOSSIP_ENABLE_BACKTRACE@
+
 DIR := src/common/gossip
 LIBSRC += $(DIR)/gossip.c
 SERVERSRC += $(DIR)/gossip.c
+MODCFLAGS_$(DIR)/gossip.c := -DGOSSIP_ENABLE_BACKTRACE