From: Jason Parker <jparker@digium.com>
Date: Wed, 19 Aug 2009 22:40:49 +0000 (+0000)
Subject: Merged revisions 213179 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~97
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f77b0a9c23968629aa1d0f168a9cfed286357b86;p=thirdparty%2Fasterisk.git

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 367de0b77d..34e1fb3862 100644
--- 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 18a118f60d..8e47d8a771 100644
--- 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