diff options
Diffstat (limited to 'apps/app_voicemail.c')
| -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" |