diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
| -rw-r--r-- | channels/dahdi/bridge_native_dahdi.c | 4 | ||||
| -rw-r--r-- | channels/dahdi/bridge_native_dahdi.h | 2 | ||||
| -rw-r--r-- | channels/sip/dialplan_functions.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index b9405d591..0b187dc32 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -19519,7 +19519,7 @@ static int load_module(void) ast_format_cap_append(dahdi_tech.capabilities, ast_format_ulaw, 0); ast_format_cap_append(dahdi_tech.capabilities, ast_format_alaw, 0); - if (dahdi_native_load(ast_module_info->self, &dahdi_tech)) { + if (dahdi_native_load(&dahdi_tech)) { ao2_ref(dahdi_tech.capabilities, -1); return AST_MODULE_LOAD_FAILURE; } diff --git a/channels/dahdi/bridge_native_dahdi.c b/channels/dahdi/bridge_native_dahdi.c index d67cb5c43..234228bd5 100644 --- a/channels/dahdi/bridge_native_dahdi.c +++ b/channels/dahdi/bridge_native_dahdi.c @@ -903,11 +903,11 @@ void dahdi_native_unload(void) * \retval 0 on success. * \retval -1 on error. */ -int dahdi_native_load(struct ast_module *mod, const struct ast_channel_tech *tech) +int dahdi_native_load(const struct ast_channel_tech *tech) { dahdi_tech = tech; - if (__ast_bridge_technology_register(&native_bridge, mod)) { + if (ast_bridge_technology_register(&native_bridge)) { dahdi_native_unload(); return -1; } diff --git a/channels/dahdi/bridge_native_dahdi.h b/channels/dahdi/bridge_native_dahdi.h index 91e8d16b7..6362a6ff5 100644 --- a/channels/dahdi/bridge_native_dahdi.h +++ b/channels/dahdi/bridge_native_dahdi.h @@ -36,7 +36,7 @@ extern "C" { /* ------------------------------------------------------------------- */ void dahdi_native_unload(void); -int dahdi_native_load(struct ast_module *mod, const struct ast_channel_tech *tech); +int dahdi_native_load(const struct ast_channel_tech *tech); /* ------------------------------------------------------------------- */ diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c index 91a46784f..33ba71c27 100644 --- a/channels/sip/dialplan_functions.c +++ b/channels/sip/dialplan_functions.c @@ -338,7 +338,7 @@ AST_TEST_DEFINE(test_sip_rtpqos_1) break; } - ast_rtp_engine_register2(&test_engine, NULL); + ast_rtp_engine_register(&test_engine); /* Have to associate this with a SIP pvt and an ast_channel */ if (!(p = sip_alloc(0, NULL, 0, SIP_NOTIFY, NULL, 0))) { res = AST_TEST_NOT_RUN; |