X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=logging.h;h=df5922b3e666e0af7a483685f895cfdb80a5b000;hb=8fc34188503e0dd131eb215b7b1832e21434c7c8;hp=1f2126839bf323faedfaf45f32fe0cc3a8253e63;hpb=0523018487a60ad817556af30632a212ad3351e0;p=elogind.git

diff --git a/logging.h b/logging.h
index 1f2126839..df5922b3e 100644
--- a/logging.h
+++ b/logging.h
@@ -24,35 +24,37 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
+#define info(format, arg...)		do { } while (0)
+#define dbg(format, arg...)		do { } while (0)
+#define dbg_parse(format, arg...)	do { } while (0)
+
 #ifdef LOG
 #include <syslog.h>
+
+#undef info
 #define info(format, arg...)								\
 	do {										\
-		log_message (LOG_INFO , format , ## arg);	\
+		log_message (LOG_INFO , format , ## arg);				\
 	} while (0)
-#else
-	#define info(format, arg...) do { } while (0)
-#endif
 
 #ifdef DEBUG
+#undef dbg
 #define dbg(format, arg...)								\
 	do {										\
 		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
 	} while (0)
-#else
-	#define dbg(format, arg...) do { } while (0)
 #endif
 
 /* Parser needs it's own debugging statement, we usually don't care about this at all */
 #ifdef DEBUG_PARSER
+#undef dbg_parse
 #define dbg_parse(format, arg...)							\
 	do {										\
 		log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);	\
 	} while (0)
-#else
-	#define dbg_parse(format, arg...) do { } while (0)
 #endif
 
+#endif	/* LOG */
 
 extern int log_message (int level, const char *format, ...)
 	__attribute__ ((format (printf, 2, 3)));