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

diff --git a/main/core_local.c b/main/core_local.c
index 8d8e6fc55de6bc0d588770155a26d0ea06b3f412..1bcd91db2a0e727078fc3ae53f7fcf80214f4429 100644 (file)
--- 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 d46ed897d77e9d58e2cb6ab71b723d0477928e37..d25a7102e858ada182f89387756cc60bf04786ca 100644 (file)
--- 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)
 {