[asterisk-commits] jrose: branch 12 r401897 - in /branches/12: ./ utils/clicompat.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Oct 25 11:57:58 2013
New Revision: 401897

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401897
Log:
revert clicompat-r2.patch from r401704

Patch caused the following build errors against testsuite
https://bamboo.asterisk.org/bamboo/browse/AST-ATRUNKBUILD4-244

(issue ASTERISK-22467)
Reported by: Corey Farrell
........

Merged revisions 401895 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 401896 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/utils/clicompat.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=401897&r1=401896&r2=401897
==============================================================================
--- branches/12/utils/clicompat.c (original)
+++ branches/12/utils/clicompat.c Fri Oct 25 11:57:58 2013
@@ -9,18 +9,8 @@
 
 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;
-}