diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2007-11-19 18:52:04 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2007-11-19 18:52:04 +0000 |
| commit | 0595b5e2aa6a868b01c617881cfefc6028817a28 (patch) | |
| tree | 7a165b52fc8cdccc78088e7e617f0bc50cc9b2a8 /main | |
| parent | 406f6f2909a84f30d730b336a05993628a15ac0c (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: https://origsvn.digium.com/svn/asterisk/trunk@89424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 5 |
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" |