[asterisk-commits] jrose: branch 12 r401936 - in /branches/12: ./ utils/

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Oct 25 12:31:38 2013
New Revision: 401936

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401936
Log:
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

Modified:
    branches/12/   (props changed)
    branches/12/utils/clicompat.c
    branches/12/utils/refcounter.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/utils/clicompat.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/clicompat.c?view=diff&rev=401936&r1=401935&r2=401936
==============================================================================
--- branches/12/utils/clicompat.c (original)
+++ branches/12/utils/clicompat.c Fri Oct 25 12:31:38 2013
@@ -9,8 +9,18 @@
 
 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;
+}

Modified: branches/12/utils/refcounter.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/refcounter.c?view=diff&rev=401936&r1=401935&r2=401936
==============================================================================
--- branches/12/utils/refcounter.c (original)
+++ branches/12/utils/refcounter.c Fri Oct 25 12:31:38 2013
@@ -314,9 +314,4 @@
 void ast_log_backtrace(void)
 {
 }
-
-int ast_register_atexit(void (*func)(void))
-{
-	return 0;
-}
 #endif