From: Martin Mares <mj@ucw.cz>
Date: Fri, 29 Oct 2004 08:41:04 +0000 (+0000)
Subject: Changed DEBUG to CONFIG_DEBUG to avoid conflicts with various libraries.
X-Git-Tag: holmes-import~884
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=dab4aabe144ad53c0a899fd14f97342f74b844bd;p=libucw.git

Changed DEBUG to CONFIG_DEBUG to avoid conflicts with various libraries.
(BTW we were probably slowing down the regex code by defining DEBUG.)
---

diff --git a/lib/lib.h b/lib/lib.h
index de5b4b8c..9d7c48ad 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -71,7 +71,7 @@ void log_file(byte *name);
 void log_fork(void);
 void log_switch(void);
 
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
 void assert_failed(char *assertion, char *file, int line) NONRET;
 #define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
 #else
diff --git a/lib/log.c b/lib/log.c
index cad127f4..4deb7598 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -99,7 +99,7 @@ die(byte *msg, ...)
 #endif
 }
 
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
 void
 assert_failed(char *assertion, char *file, int line)
 {
diff --git a/lib/mainloop.c b/lib/mainloop.c
index c83c9262..4f3766d0 100644
--- a/lib/mainloop.c
+++ b/lib/mainloop.c
@@ -278,7 +278,7 @@ process_fork(struct main_process *mp)
 void
 main_debug(void)
 {
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   log(L_DEBUG, "### Main loop status on %d", (int)now);
   log(L_DEBUG, "\tActive timers:");
   struct main_timer *tm;