diff options
-rw-r--r-- | apps/app_rpt.c | 4 | ||||
-rw-r--r-- | include/asterisk/app.h | 2 | ||||
-rw-r--r-- | include/asterisk/module.h | 2 | ||||
-rw-r--r-- | res/res_agi.c | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c index 4bca3e07b..e7fbc8145 100644 --- a/apps/app_rpt.c +++ b/apps/app_rpt.c @@ -287,10 +287,6 @@ char *discstr = "!!DISCONNECT!!"; static char *remote_rig_ft897 = "ft897"; static char *remote_rig_rbi = "rbi"; -#ifdef OLD_ASTERISK -STANDARD_LOCAL_USER; -#endif - #define MSWAIT 200 #define HANGTIME 5000 #define TOTIME 180000 diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 26523d4bd..306ae47c2 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -394,7 +394,7 @@ struct ast_app_option { ... do any argument parsing here ... if (ast_parseoptions(my_app_options, &opts, opt_args, options)) { - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return -1; } } diff --git a/include/asterisk/module.h b/include/asterisk/module.h index 1b257ed15..ac0fe5dd4 100644 --- a/include/asterisk/module.h +++ b/include/asterisk/module.h @@ -97,7 +97,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode); * This function calulates use counts and notifies anyone trying to keep track * of them. It should be called whenever your module's usecount changes. * - * \note The LOCAL_USER macros take care of calling this function for you. + * \note The ast_module_user_* functions take care of calling this function for you. */ void ast_update_use_count(void); diff --git a/res/res_agi.c b/res/res_agi.c index cf84bb9c3..77e56f5f2 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2457,7 +2457,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int /* Answer if need be */ if (chan->_state != AST_STATE_UP) { if (ast_answer(chan)) { - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return -1; } } |