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 de5b4b8cac65b2935543a57add7e70aa4b1ed909..9d7c48ad0de342addf90a5b6593ecdb6a9571cff 100644 (file)
--- 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 cad127f47bb241a1ab7fb2c850ff046c24879226..4deb75980ab47b8dd01c146069cace478aa728ae 100644 (file)
--- 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 c83c9262f0149951a70f46750b2c80ee18c8cb56..4f3766d063675a8f464180bbe1b0809da7987527 100644 (file)
--- 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;