Author: coreyfarrell Date: Thu Mar 26 18:09:04 2015 New Revision: 433501 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433501 Log: Fix compile errors caused by r4500 / r4501.
* 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 ........ Merged revisions 433500 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/main/core_local.c trunk/utils/clicompat.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/main/core_local.c URL: http://svnview.digium.com/svn/asterisk/trunk/main/core_local.c?view=diff&rev=433501&r1=433500&r2=433501 ============================================================================== --- trunk/main/core_local.c (original) +++ trunk/main/core_local.c Thu Mar 26 18:09:04 2015 @@ -998,9 +998,6 @@ */ 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"); Modified: trunk/utils/clicompat.c URL: http://svnview.digium.com/svn/asterisk/trunk/utils/clicompat.c?view=diff&rev=433501&r1=433500&r2=433501 ============================================================================== --- trunk/utils/clicompat.c (original) +++ trunk/utils/clicompat.c Thu Mar 26 18:09:04 2015 @@ -14,6 +14,13 @@ { 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) { -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits