aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-19 22:39:42 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-19 22:39:42 +0000
commit746d8d7af43549b1528f0acec2afb0da02f37aa3 (patch)
tree36902888a9842733de8c5961089bfd725235515c /main
parentdbf41704ec69bc67d2a6933e152f6d8670c09590 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@213180 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/alaw.c1
-rw-r--r--main/ulaw.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/main/alaw.c b/main/alaw.c
index 367de0b77..34e1fb386 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 18a118f60..8e47d8a77 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