aboutsummaryrefslogtreecommitdiffstats
path: root/main/logger.c
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-19 18:52:04 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2007-11-19 18:52:04 +0000
commit9cf442d7f72870c9616ab967f2227cc1a145918c (patch)
tree7a165b52fc8cdccc78088e7e617f0bc50cc9b2a8 /main/logger.c
parentb3e3d224967c073bcd52758fd7753d7422b952d0 (diff)
include "logger.h" and errno.h from asterisk.h - usage shows that they
were included almost everywhere. Remove some of the instances. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89424 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/logger.c')
-rw-r--r--main/logger.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/logger.c b/main/logger.c
index 457c2bd07..d1c5b476a 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -25,6 +25,10 @@
* \author Mark Spencer <markster@digium.com>
*/
+/* Prevent inclusion of logger.h - it redefines LOG_* which we need
+ * to define syslog_level_map. Later, we force its inclusion again.
+ */
+#define _ASTERISK_LOGGER_H
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -55,6 +59,7 @@ static int syslog_level_map[] = {
#define SYSLOG_NLEVELS sizeof(syslog_level_map) / sizeof(int)
+#undef _ASTERISK_LOGGER_H /* now include logger.h */
#include "asterisk/logger.h"
#include "asterisk/lock.h"
#include "asterisk/options.h"