[asterisk-commits] seanbright: branch 1.6.1 r148240 - in /branches/1.6.1: ./ apps/ include/ main...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Thu Oct  9 20:33:34 2008
New Revision: 148240

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148240
Log:
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

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c
    branches/1.6.1/include/asterisk.h
    branches/1.6.1/main/cryptostub.c
    branches/1.6.1/main/tdd.c
    branches/1.6.1/res/res_config_sqlite.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=148240&r1=148239&r2=148240
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Thu Oct  9 20:33:34 2008
@@ -61,12 +61,8 @@
 </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>
@@ -86,8 +82,6 @@
 #endif
 #endif
 
-#include "asterisk.h"
-
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/paths.h"	/* use ast_config_AST_SPOOL_DIR */
@@ -97,6 +91,7 @@
 #include <time.h>
 #include <dirent.h>
 
+#include "asterisk/logger.h"
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
 #include "asterisk/channel.h"

Modified: branches/1.6.1/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk.h?view=diff&rev=148240&r1=148239&r2=148240
==============================================================================
--- branches/1.6.1/include/asterisk.h (original)
+++ branches/1.6.1/include/asterisk.h Thu Oct  9 20:33:34 2008
@@ -25,8 +25,6 @@
 #endif
 
 #include "asterisk/compat.h"
-
-#include "asterisk/logger.h"
 
 /* Default to allowing the umask or filesystem ACLs to determine actual file
  * creation permissions

Modified: branches/1.6.1/main/cryptostub.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/cryptostub.c?view=diff&rev=148240&r1=148239&r2=148240
==============================================================================
--- branches/1.6.1/main/cryptostub.c (original)
+++ branches/1.6.1/main/cryptostub.c Thu Oct  9 20:33:34 2008
@@ -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)
 {

Modified: branches/1.6.1/main/tdd.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/tdd.c?view=diff&rev=148240&r1=148239&r2=148240
==============================================================================
--- branches/1.6.1/main/tdd.c (original)
+++ branches/1.6.1/main/tdd.c Thu Oct  9 20:33:34 2008
@@ -35,6 +35,7 @@
 #include <math.h>
 #include <ctype.h>
 
+#include "asterisk/logger.h"
 #include "asterisk/ulaw.h"
 #include "asterisk/tdd.h"
 #include "asterisk/fskmodem.h"

Modified: branches/1.6.1/res/res_config_sqlite.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_config_sqlite.c?view=diff&rev=148240&r1=148239&r2=148240
==============================================================================
--- branches/1.6.1/res/res_config_sqlite.c (original)
+++ branches/1.6.1/res/res_config_sqlite.c Thu Oct  9 20:33:34 2008
@@ -80,6 +80,7 @@
 
 #include <sqlite.h>
 
+#include "asterisk/logger.h"
 #include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"