From 5579bb50570301cff5ee6e24f141055e9fe7472a Mon Sep 17 00:00:00 2001
From: seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Fri, 10 Oct 2008 01:25:31 +0000
Subject: Merged revisions 148200 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
r148200 | seanbright | 2008-10-09 20:42:13 -0400 (Thu, 09 Oct 2008) | 12 lines

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: http://svn.digium.com/svn/asterisk/branches/1.6.0@148204 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_voicemail.c    | 11 +++--------
 include/asterisk.h      |  2 --
 main/cryptostub.c       |  1 +
 main/tdd.c              |  1 +
 res/res_config_sqlite.c |  1 +
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 419b09803..5eff1c324 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -61,12 +61,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 LOG_WARNING and
- * 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>
@@ -86,8 +82,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 */
@@ -97,6 +91,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 7ae81136b..eed328e9d 100644
--- 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 ffdaa6635..1a0ffa4e8 100644
--- 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 8cbe18837..b2249b908 100644
--- 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 22b120bb3..f0ec4f92a 100644
--- 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/pbx.h"
 #include "asterisk/cdr.h"
 #include "asterisk/cli.h"
-- 
cgit v1.2.3