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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@213181 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/alaw.c b/main/alaw.c
index 367de0b77d1e731ca43a9b1d786fd7dcec8bb07f..34e1fb386296cfb29c32a4ce9a52c01f9f406172 100644 (file)
--- a/main/alaw.c
+++ b/main/alaw.c
@@ -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

diff --git a/main/ulaw.c b/main/ulaw.c
index 18a118f60db07343d245af1a9c1bc08edba003a5..8e47d8a771bc5266892ea43c7d05709b629a7833 100644 (file)
--- a/main/ulaw.c
+++ b/main/ulaw.c
@@ -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