[svn-commits] qwell: branch 1.6.0 r213180 - in /branches/1.6.0: ./ main/alaw.c main/ulaw.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Aug 19 17:39:42 2009
New Revision: 213180

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213180
Log:
Merged revisions 213179 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213179 | qwell | 2009-08-19 17:38:46 -0500 (Wed, 19 Aug 2009) | 5 lines
  
  Fix compile when certain G711 menuselect options are enabled.
  
  (closes issue #15697)
  Reported by: slavon
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/alaw.c
    branches/1.6.0/main/ulaw.c

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

Modified: branches/1.6.0/main/alaw.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/alaw.c?view=diff&rev=213180&r1=213179&r2=213180
==============================================================================
--- branches/1.6.0/main/alaw.c (original)
+++ branches/1.6.0/main/alaw.c Wed Aug 19 17:39:42 2009
@@ -28,6 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/alaw.h"
+#include "asterisk/logger.h"
 
 #ifndef G711_NEW_ALGORITHM
 #define AMI_MASK 0x55

Modified: branches/1.6.0/main/ulaw.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/ulaw.c?view=diff&rev=213180&r1=213179&r2=213180
==============================================================================
--- branches/1.6.0/main/ulaw.c (original)
+++ branches/1.6.0/main/ulaw.c Wed Aug 19 17:39:42 2009
@@ -28,6 +28,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/ulaw.h"
+#include "asterisk/logger.h"
 
 #if 0
 /* ZEROTRAP is the military recommendation to improve the encryption