remove the macro LOAD_OH and expand it inline in the only
authorLuigi Rizzo <rizzo@icir.org>
Fri, 15 Dec 2006 03:59:31 +0000 (03:59 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Fri, 15 Dec 2006 03:59:31 +0000 (03:59 +0000)
place where it was used.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48476 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/channel.h
main/pbx.c

index 835db89..0ce8820 100644 (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;
index f30d535..8a7d720 100644 (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;