diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-12-15 03:59:31 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-12-15 03:59:31 +0000 |
| commit | 5ba11f985516c84d6dd326a2d61f52ba54ae7de4 (patch) | |
| tree | 8620df2294558e580d88f9fb2a303bdd6572d406 | |
| parent | f6649ae0af633ccf1aaf5596246a164c44220951 (diff) | |
remove the macro LOAD_OH and expand it inline in the only
place where it was used.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48476 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/channel.h | 11 | ||||
| -rw-r--r-- | main/pbx.c | 10 |
2 files changed, 9 insertions, 12 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 835db89bb..0ce88200a 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -543,17 +543,6 @@ struct ast_bridge_config { struct chanmon; -#define LOAD_OH(oh) { \ - oh.context = context; \ - oh.exten = exten; \ - oh.priority = priority; \ - oh.cid_num = cid_num; \ - oh.cid_name = cid_name; \ - oh.account = account; \ - oh.vars = vars; \ - oh.parent_channel = NULL; \ -} - struct outgoing_helper { const char *context; const char *exten; diff --git a/main/pbx.c b/main/pbx.c index f30d53572..8a7d7200e 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4878,7 +4878,15 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout pthread_attr_t attr; if (sync) { - LOAD_OH(oh); + oh.context = context; + oh.exten = exten; + oh.priority = priority; + oh.cid_num = cid_num; + oh.cid_name = cid_name; + oh.account = account; + oh.vars = vars; + oh.parent_channel = NULL; + chan = __ast_request_and_dial(type, format, data, timeout, reason, cid_num, cid_name, &oh); if (channel) { *channel = chan; |