[svn-commits] mmichelson: trunk r256529 - in /trunk: channels/ funcs/ tests/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Apr  9 10:56:55 2010
New Revision: 256529

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=256529
Log:
Fix some compiler errors that popped up after the CCSS merge.


Modified:
    trunk/channels/chan_sip.c
    trunk/funcs/func_srv.c
    trunk/tests/test_gosub.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=256529&r1=256528&r2=256529
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Apr  9 10:56:55 2010
@@ -1920,7 +1920,7 @@
 		ast_get_ccnr_available_timer(monitor->interface->config_params);
 
 	sip_pvt_lock(monitor_instance->subscription_pvt);
-	create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1);
+	create_addr(monitor_instance->subscription_pvt, monitor_instance->peername, 0, 1, NULL);
 	ast_sip_ouraddrfor(&monitor_instance->subscription_pvt->sa.sin_addr, &monitor_instance->subscription_pvt->ourip, monitor_instance->subscription_pvt);
 	monitor_instance->subscription_pvt->subscribed = CALL_COMPLETION;
 	monitor_instance->subscription_pvt->expiry = when;
@@ -10611,7 +10611,7 @@
 
 	sip_pvt_lock(pvt);
 
-	if (create_addr(pvt, epa_entry->destination, NULL, TRUE)) {
+	if (create_addr(pvt, epa_entry->destination, NULL, TRUE, NULL)) {
 		dialog_unlink_all(pvt, TRUE, TRUE);
 		dialog_unref(pvt, "create_addr failed in transmit_publish. Unref dialog");
 	}

Modified: trunk/funcs/func_srv.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_srv.c?view=diff&rev=256529&r1=256528&r2=256529
==============================================================================
--- trunk/funcs/func_srv.c (original)
+++ trunk/funcs/func_srv.c Fri Apr  9 10:56:55 2010
@@ -31,6 +31,8 @@
 #include "asterisk/srv.h"
 #include "asterisk/pbx.h"
 #include "asterisk/app.h"
+#include "asterisk/datastore.h"
+#include "asterisk/channel.h"
 
 /*** DOCUMENTATION
 	<function name="SRVQUERY" language="en_US">

Modified: trunk/tests/test_gosub.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_gosub.c?view=diff&rev=256529&r1=256528&r2=256529
==============================================================================
--- trunk/tests/test_gosub.c (original)
+++ trunk/tests/test_gosub.c Fri Apr  9 10:56:55 2010
@@ -37,6 +37,7 @@
 #include "asterisk/module.h"
 #include "asterisk/test.h"
 #include "asterisk/pbx.h"
+#include "asterisk/channel.h"
 
 AST_TEST_DEFINE(test_gosub)
 {