diff options
| author | Steve Murphy <murf@digium.com> | 2007-10-26 17:39:39 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-10-26 17:39:39 +0000 |
| commit | c9f3efc3819c2939101b6fad9f659690c8a325a4 (patch) | |
| tree | 684099f02056498804e98698f642101c1af2ebfa /include | |
| parent | cf861b38c79e99feaa66d17c9e6c1d6b75fd988c (diff) | |
Merged revisions 87168 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r87168 | murf | 2007-10-26 10:34:02 -0600 (Fri, 26 Oct 2007) | 1 line
closes issue #11086 where a user complains that references to following contexts report a problem; The problem was REALLy that he was referring to empty contexts, which were being ignored. Reporter stated that empty contexts should be OK. I checked it out against extensions.conf, and sure enough, empty contexts ARE ok. So, I removed the restriction from AEL. This, though, highlighted a problem with multiple contexts of the same name. This should be OK, also. So, I added the extend keyword to AEL, and it can preceed the 'context' keyword (mixed with 'abstract', if nec.). This will turn off the warnings in AEL if the same context name is used 2 or more times. Also, I now call ast_context_find_or_create for contexts now, instead of just ast_context_create; I did this because pbx_config does this. The 'extend' keyword thus becomes a statement of intent. AEL can now duplicate the behavior of pbx_config,
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/pval.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/pval.h b/include/asterisk/pval.h index 11d672db2..edfd647b3 100644 --- a/include/asterisk/pval.h +++ b/include/asterisk/pval.h @@ -77,10 +77,11 @@ struct pval char *for_inc; /* used in FOR */ struct pval *else_statements; /* used in IF */ struct pval *macro_statements; /* used in MACRO */ - int abstract; /* used for context */ + int abstract; /* used for context 1=abstract; 2=extend; 3=both */ char *hints; /* used in EXTENSION */ int goto_target_in_case; /* used in GOTO */ struct ael_extension *compiled_label; + struct pval *extend; /* to link extended contexts to the 'original' */ } u3; union |