summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-08-23 20:20:17 +0000
committerRussell Bryant <russell@russellbryant.com>2007-08-23 20:20:17 +0000
commit2290819e6df43a73288f530e5aa46c792b058626 (patch)
treed7d388666a5d933fa35b732c17aed7084b8143e0 /include
parent0ebb5c87775584b294cf0173ef900ff0e35435eb (diff)
Merged revisions 80573 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80573 | russell | 2007-08-23 15:16:41 -0500 (Thu, 23 Aug 2007) | 5 lines When executing a dynamic feature, don't look it up a second time by digit pattern after we already looked it up by name. This causes broken behavior if there is more than one feature defined with the same digit pattern. (closes issue #10539, reported by bungalow, patch by me) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/features.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/features.h b/include/asterisk/features.h
index 7d52b6b03..59e068544 100644
--- a/include/asterisk/features.h
+++ b/include/asterisk/features.h
@@ -38,7 +38,7 @@ struct ast_call_feature {
char sname[FEATURE_SNAME_LEN];
char exten[FEATURE_MAX_LEN];
char default_exten[FEATURE_MAX_LEN];
- int (*operation)(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense);
+ int (*operation)(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense, void *data);
unsigned int flags;
char app[FEATURE_APP_LEN];
char app_args[FEATURE_APP_ARGS_LEN];