From: Luigi Rizzo <rizzo@icir.org>
Date: Fri, 15 Dec 2006 03:59:31 +0000 (+0000)
Subject: remove the macro LOAD_OH and expand it inline in the only
X-Git-Tag: 1.6.0-beta1~3^2~3735
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba11f985516c84d6dd326a2d61f52ba54ae7de4;p=thirdparty%2Fasterisk.git

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 835db89bb3..0ce88200ae 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 f30d535726..8a7d7200e5 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;