From ae7b76a1b9bcdb80b2e62ae66b3ec2e6b06ed4cb Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 9 Apr 2010 15:56:55 +0000 Subject: [PATCH] Fix some compiler errors that popped up after the CCSS merge. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@256529 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 ++-- funcs/func_srv.c | 2 ++ tests/test_gosub.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 91773b05c2..9e8efac25c 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -1920,7 +1920,7 @@ static int sip_cc_monitor_request_cc(struct ast_cc_monitor *monitor, int *availa 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 @@ static int transmit_publish(struct sip_epa_entry *epa_entry, enum sip_publish_ty 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"); } diff --git a/funcs/func_srv.c b/funcs/func_srv.c index 339a0284bf..9715a276cf 100644 --- a/funcs/func_srv.c +++ b/funcs/func_srv.c @@ -31,6 +31,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/srv.h" #include "asterisk/pbx.h" #include "asterisk/app.h" +#include "asterisk/datastore.h" +#include "asterisk/channel.h" /*** DOCUMENTATION diff --git a/tests/test_gosub.c b/tests/test_gosub.c index 75c09f8ce1..c2b510367b 100644 --- a/tests/test_gosub.c +++ b/tests/test_gosub.c @@ -37,6 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/test.h" #include "asterisk/pbx.h" +#include "asterisk/channel.h" AST_TEST_DEFINE(test_gosub) {