diff options
| author | Sean Bright <sean@malleable.com> | 2008-10-10 00:42:13 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-10-10 00:42:13 +0000 |
| commit | 1dedb785ab10f62bdb15cabafacae945d88b3bd2 (patch) | |
| tree | e25f3ca9f50b21e10e86708333456f3fe943e8ea /apps | |
| parent | 9851feb8fb9cd940e58eaf3c4384bedb8528fd65 (diff) | |
Don't include logger.h in asterisk.h by default as it is causing problems building
app_voicemail. Instead, include it where it is needed. This turned out to be a
relatively minor issue because other headers include logger.h as well.
Need to test -addons before merging this back to 1.6.0.
(closes issue #13605)
Reported by: tomo1657
Patches:
13605_seanbright.diff uploaded by seanbright (license 71)
Tested by: mmichelson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@148200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 10b8d568b..58400595a 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -63,12 +63,8 @@ c-client (http://www.washington.edu/imap/ </category> ***/ -/* It is important to include the IMAP_STORAGE related headers - * before asterisk.h since asterisk.h includes logger.h. logger.h - * and c-client.h have conflicting definitions for AST_LOG_WARNING and - * AST_LOG_DEBUG, so it's important that we use Asterisk's definitions - * here instead of the c-client's - */ +#include "asterisk.h" + #ifdef IMAP_STORAGE #include <ctype.h> #include <signal.h> @@ -88,8 +84,6 @@ c-client (http://www.washington.edu/imap/ #endif #endif -#include "asterisk.h" - ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */ @@ -99,6 +93,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include <time.h> #include <dirent.h> +#include "asterisk/logger.h" #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/channel.h" |