kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors caused by r4500 / r4501.

Browse Source 
* Add ast_register_cleanup to utils/clicompat.c to deal with
  any utils that copy sources from main.
* Asterisk 13+: remove unused variables from core_local.c.

Review: https://reviewboard.asterisk.org/r/4534/
........

Merged revisions 433499 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433500 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2015-03-26 23:07:15 +00:00
parent 6adf26f14d
commit 4b225e2104
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/core_local.c
View File

@@ -1001,9 +1001,6 @@ static int locals_cmp_cb(void *obj, void *arg, int flags)
*/
static void local_shutdown(void)
{
struct local_pvt *p;
struct ao2_iterator it;
/* First, take us out of the channel loop */
ast_cli_unregister_multiple(cli_local, ARRAY_LEN(cli_local));
ast_manager_unregister("LocalOptimizeAway");

7
utils/clicompat.c
View File

@@ -14,6 +14,13 @@ int ast_register_atexit(void (*func)(void))
{
return 0;
}
int ast_register_cleanup(void (*func)(void));
int ast_register_cleanup(void (*func)(void))
{
return 0;
}
int ast_cli_register_multiple(struct ast_cli_entry *e, int len);
int ast_cli_register_multiple(struct ast_cli_entry *e, int len)
{