summaryrefslogtreecommitdiff
path: root/libdaemon
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2012-10-15 14:20:11 +0100
committerAlasdair G Kergon <agk@redhat.com>2012-10-15 14:20:11 +0100
commit8290de964fbf0e6dcb9622f2e234a1bd794ea2e2 (patch)
tree24dce5befb0371b785db85bf763c436e2303af2c /libdaemon
parent895ee616425215136ec346d4637d2887add27913 (diff)
downloadlvm2-8290de964fbf0e6dcb9622f2e234a1bd794ea2e2.tar.gz
lvmetad: rename DEBUG() to DEBUGLOG()
DEBUG is already defined by -DDEBUG
Diffstat (limited to 'libdaemon')
-rw-r--r--libdaemon/server/daemon-log.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/libdaemon/server/daemon-log.h b/libdaemon/server/daemon-log.h
index f09fc2a59..e2e11c587 100644
--- a/libdaemon/server/daemon-log.h
+++ b/libdaemon/server/daemon-log.h
@@ -23,13 +23,8 @@ enum { DAEMON_LOG_FATAL = 0 /* usually preceding daemon death */
, DAEMON_LOG_DEBUG = 5 /* unsorted debug stuff */
};
-/*
- * FIXME: We are currently compiling with -DDEBUG
- * so this define DEBUG collision needs fixing
- */
-#undef DEBUG
-#define DEBUG(s, x...) daemon_logf((s)->log, DAEMON_LOG_DEBUG, x)
-#define DEBUG_cft(s, i, n) daemon_log_cft((s)->log, DAEMON_LOG_DEBUG, i, n)
+#define DEBUGLOG(s, x...) daemon_logf((s)->log, DAEMON_LOG_DEBUG, x)
+#define DEBUGLOG_cft(s, i, n) daemon_log_cft((s)->log, DAEMON_LOG_DEBUG, i, n)
#define WARN(s, x...) daemon_logf((s)->log, DAEMON_LOG_WARN, x)
#define INFO(s, x...) daemon_logf((s)->log, DAEMON_LOG_INFO, x)
#define ERROR(s, x...) daemon_logf((s)->log, DAEMON_LOG_ERROR, x)