diff options
| author | Corey Farrell <git@cfware.com> | 2015-03-26 23:09:04 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-03-26 23:09:04 +0000 |
| commit | 554eb7451638f8384f5150c3adc202194b5fafc0 (patch) | |
| tree | e0523e8ca456e7f5163f799201f12540f39676f2 | |
| parent | 3ddd92902af9eaa3018f7e25e430afcfe4322845 (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/core_local.c | 3 | ||||
| -rw-r--r-- | utils/clicompat.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/main/core_local.c b/main/core_local.c index 8d8e6fc55..1bcd91db2 100644 --- a/main/core_local.c +++ b/main/core_local.c @@ -998,9 +998,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"); diff --git a/utils/clicompat.c b/utils/clicompat.c index d46ed897d..d25a7102e 100644 --- a/utils/clicompat.c +++ b/utils/clicompat.c @@ -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) { |