From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 23 Jul 2012 11:13:02 +0000 (+0200)
Subject: Networker: don't override the other macro, declare our own.
X-Git-Tag: v8.20~300
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=610d4d2388745ecbbd0fd56ca2f26d0f570f4ed3

Networker: don't override the other macro, declare our own.
---

diff --git a/citadel/modules/network/serv_networkclient.c b/citadel/modules/network/serv_networkclient.c
index a0682aeaa..d588a84f9 100644
--- a/citadel/modules/network/serv_networkclient.c
+++ b/citadel/modules/network/serv_networkclient.c
@@ -93,25 +93,25 @@ struct CitContext networker_client_CC;
 
 int NetworkClientDebugEnabled = 0;
 
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (NetworkClientDebugEnabled != 0))
+#define CDBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (NetworkClientDebugEnabled != 0))
 
 #define EVN_syslog(LEVEL, FORMAT, ...) \
-	DBGLOG(LEVEL) syslog(LEVEL, \
-	       "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
-	       IO->ID, CCID, NODE, N, __VA_ARGS__)
+	CDBGLOG(LEVEL) syslog(LEVEL, \
+			      "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT,	\
+			      IO->ID, CCID, NODE, N, __VA_ARGS__)
 
 #define EVNM_syslog(LEVEL, FORMAT) \
-	DBGLOG(LEVEL) syslog(LEVEL, \
+	CDBGLOG(LEVEL) syslog(LEVEL, \
 	       "IO[%ld]CC[%d]NW[%s][%ld]" FORMAT, \
-	       IO->ID, CCID, NODE, N)
+			      IO->ID, CCID, NODE, N)
 
 #define EVNCS_syslog(LEVEL, FORMAT, ...) \
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
-	       IO->ID, NODE, N, __VA_ARGS__)
+	CDBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+			      IO->ID, NODE, N, __VA_ARGS__)
 
 #define EVNCSM_syslog(LEVEL, FORMAT) \
-	DBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
-	       IO->ID, NODE, N)
+	CDBGLOG(LEVEL) syslog(LEVEL, "IO[%ld]NW[%s][%ld]" FORMAT, \
+			      IO->ID, NODE, N)
 
 
 typedef enum _eNWCState {