aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-22 18:14:44 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-22 18:14:44 +0000
commitf28a21a4bfee4df1e708ce47eccc51da47152fea (patch)
tree95b51e4f8740dcb7aadbcca08d7eb1165054e1ba /main
parent4b004c6df5c04870b17bcf60649fb8e57be7211a (diff)
Merged revisions 114540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r114540 | qwell | 2008-04-22 13:14:09 -0500 (Tue, 22 Apr 2008) | 8 lines Allow setqueuevar=yes (et al) to work, after changes to pbx_builtin_setvar() (closes issue #12490) Reported by: bcnit Patches: 12490-queuevars-3.diff uploaded by qwell (license 4) Tested by: qwell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114541 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 3babc8f92..a2d27b45f 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -318,7 +318,7 @@ static int pbx_builtin_sayphonetic(struct ast_channel *, void *);
static int matchcid(const char *cidpattern, const char *callerid);
int pbx_builtin_setvar(struct ast_channel *, void *);
void log_match_char_tree(struct match_char *node, char *prefix); /* for use anywhere */
-static int pbx_builtin_setvar_multiple(struct ast_channel *, void *);
+int pbx_builtin_setvar_multiple(struct ast_channel *, void *);
static int pbx_builtin_importvar(struct ast_channel *, void *);
static void set_ext_pri(struct ast_channel *c, const char *exten, int pri);
static void new_find_extension(const char *str, struct scoreboard *score, struct match_char *tree, int length, int spec, const char *callerid, enum ext_match_t action);
@@ -7560,7 +7560,7 @@ int pbx_builtin_setvar(struct ast_channel *chan, void *data)
return(0);
}
-static int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
+int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
{
char *data;
int x;