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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 10b8d56..5840059 100644 (file)
--- 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"

diff --git a/include/asterisk.h b/include/asterisk.h
index 7ae8113..eed328e 100644 (file)
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -26,8 +26,6 @@
 
 #include "asterisk/compat.h"
 
-#include "asterisk/logger.h"
-
 /* Default to allowing the umask or filesystem ACLs to determine actual file
  * creation permissions
  */

diff --git a/main/cryptostub.c b/main/cryptostub.c
index ffdaa66..1a0ffa4 100644 (file)
--- a/main/cryptostub.c
+++ b/main/cryptostub.c
@@ -28,6 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/crypto.h"
+#include "asterisk/logger.h"
 
 static struct ast_key *stub_ast_key_get(const char *kname, int ktype)
 {

diff --git a/main/tdd.c b/main/tdd.c
index 043d07c..41f2ed2 100644 (file)
--- a/main/tdd.c
+++ b/main/tdd.c
@@ -35,6 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <math.h>
 #include <ctype.h>
 
+#include "asterisk/logger.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/tdd.h"
 #include "asterisk/fskmodem.h"

diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 05dc64d..7a18d00 100644 (file)
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -80,6 +80,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sqlite.h>
 
+#include "asterisk/logger.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"