From e920fc0669ecbfccce2d4ea3fac0425be00d7b75 Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Fri, 25 Oct 2013 17:32:17 +0000
Subject: [PATCH] Put clicompat-r2.patch back in
We've figured out how to resolve the problems this was causing in 12/trunk,
so this can go back in now.
(issue ASTERISK-22467)
Reported by: Corey Farrell
Patches:
clicompat-r2.patch uploaded by coreyfarrell (license 5909)
........
Merged revisions 401914 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401935 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401936 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
utils/clicompat.c | 10 ++++++++++
utils/refcounter.c | 5 -----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/utils/clicompat.c b/utils/clicompat.c
index 33f90fae16..d46ed897d7 100644
--- a/utils/clicompat.c
+++ b/utils/clicompat.c
@@ -9,8 +9,18 @@ void ast_cli(int fd, const char *fmt, ...)
struct ast_cli_entry;
+int ast_register_atexit(void (*func)(void));
+int ast_register_atexit(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)
{
return 0;
}
+int ast_cli_unregister_multiple(struct ast_cli_entry *e, int len);
+int ast_cli_unregister_multiple(struct ast_cli_entry *e, int len)
+{
+ return 0;
+}
diff --git a/utils/refcounter.c b/utils/refcounter.c
index 2f17b9c85d..16d7fc8d5f 100644
--- a/utils/refcounter.c
+++ b/utils/refcounter.c
@@ -314,9 +314,4 @@ void *__ast_bt_destroy(struct ast_bt *bt)
void ast_log_backtrace(void)
{
}
-
-int ast_register_atexit(void (*func)(void))
-{
- return 0;
-}
#endif
--
GitLab