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

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 835db89bb36e6b2e572e2ef4fce66b4f478aec97..0ce88200aeb9f0db9012b00b8fe0effd1b63b7ee 100644 (file)
--- 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 f30d5357268ebddb1de5c32f6458aaa9b3347f91..8a7d7200e5e5c3c0af0a5982d0e6f2236c7d4dc1 100644 (file)
--- 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;