[asterisk-commits] rizzo: trunk r48476 - in /trunk: include/asterisk/channel.h main/pbx.c

[asterisk-commits at lists.digium.com]

Author: rizzo
Date: Thu Dec 14 21:59:31 2006
New Revision: 48476

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48476
Log:
remove the macro LOAD_OH and expand it inline in the only
place where it was used.


Modified:
    trunk/include/asterisk/channel.h
    trunk/main/pbx.c

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=48476&r1=48475&r2=48476
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Dec 14 21:59:31 2006
@@ -543,17 +543,6 @@
 
 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;

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=48476&r1=48475&r2=48476
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Dec 14 21:59:31 2006
@@ -4878,7 +4878,15 @@
 	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;