merge changes from team/murf/AEL-trunk-fixesonly

- fix callerid matching for extensions
 - fix nested switch statements
 - fix compilation with bison 2.1a or higher
(issue #7309)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-18 21:36:24 +00:00
parent c229baa0cf
commit 73ae55698f
16 changed files with 1229 additions and 1021 deletions

View File

@@ -170,6 +170,7 @@ struct ael_priority
struct ael_extension
{
char *name;
char *cidmatch;
char *hints;
int regexten;