kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

The changes to header inclusion in trunk broke compilation of app_voicemail when using

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@94345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2007-12-20 23:43:24 +00:00
parent a9616a7153
commit 51a48a2ed9
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/app_voicemail.c
View File

@@ -61,17 +61,12 @@ c-client (http://www.washington.edu/imap/
</category> </category>
***/ ***/
#include "asterisk.h" /*It is important to include the IMAP_STORAGE related headers
* before asterisk.h since asterisk.h includes logger.h. logger.h
ASTERISK_FILE_VERSION(__FILE__, "$Revision$") * and c-client.h have conflicting definitions for LOG_WARNING and
* LOG_DEBUG, so it's important that we use Asterisk's definitions
#include "asterisk/paths.h" /* use ast_config_AST_SPOOL_DIR */ * here instead of the c-client's
#include <sys/time.h> */
#include <sys/stat.h>
#include <sys/mman.h>
#include <time.h>
#include <dirent.h>
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
#include <ctype.h> #include <ctype.h>
#include <signal.h> #include <signal.h>
@@ -87,6 +82,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif #endif
#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/lock.h"
#include "asterisk/file.h" #include "asterisk/file.h"
#include "asterisk/channel.h" #include "asterisk/channel.h"