diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-20 23:43:24 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-20 23:43:24 +0000 |
| commit | 6bdde69e7989206f7c257df23b9a04d56f3c7413 (patch) | |
| tree | 18b06fed45dcf117bb68af591c1aaf7b4f1d6493 | |
| parent | ac2a00d4a44a40c7e1ffc1baa21a35f55754d383 (diff) | |
The changes to header inclusion in trunk broke compilation of app_voicemail when using
IMAP storage. The reason is that c-client has its own definitions for LOG_WARNING
and LOG_DEBUG, so we need to be sure to include asterisk's definitions last so that
we use the proper values in app_voicemail.
(closes issue #11437, reported by blitzrage, patch suggested by blitzrage)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@94345 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_voicemail.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index d6999189c..d582c195f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -61,17 +61,12 @@ c-client (http://www.washington.edu/imap/ </category> ***/ -#include "asterisk.h" - -ASTERISK_FILE_VERSION(__FILE__, "$Revision$") - -#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */ -#include <sys/time.h> -#include <sys/stat.h> -#include <sys/mman.h> -#include <time.h> -#include <dirent.h> - +/*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 LOG_WARNING and + * LOG_DEBUG, so it's important that we use Asterisk's definitions + * here instead of the c-client's + */ #ifdef IMAP_STORAGE #include <ctype.h> #include <signal.h> @@ -87,6 +82,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #endif +#include "asterisk.h" + +ASTERISK_FILE_VERSION(__FILE__, "$Revision$") + +#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */ +#include <sys/time.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <time.h> +#include <dirent.h> + #include "asterisk/lock.h" #include "asterisk/file.h" #include "asterisk/channel.h" |