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
This commit is contained in:
Jason Parker
2009-08-19 22:40:49 +00:00
parent da1425c3fd
commit f77b0a9c23
2 changed files with 2 additions and 0 deletions

View File

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

View File

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