dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

remove the macro LOAD_OH and expand it inline in the only 

place where it was used.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48476 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rizzo 2006-12-15 03:59:31 +00:00
parent 9767c79f32
commit 889d8eecec
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/channel.h
View File

@ -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;

10
main/pbx.c
View File

@ -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;