[svn-commits] dlee: branch 12 r398750 - in /branches/12: ./ utils/

[SVN commits to the Digium repositories]

Author: dlee
Date: Tue Sep 10 12:25:02 2013
New Revision: 398750

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398750
Log:
Fixed utils directory breakage from r398648
........

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

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

Modified:
    branches/12/   (props changed)
    branches/12/utils/ael_main.c
    branches/12/utils/check_expr.c
    branches/12/utils/conf2ael.c

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

Modified: branches/12/utils/ael_main.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/ael_main.c?view=diff&rev=398750&r1=398749&r2=398750
==============================================================================
--- branches/12/utils/ael_main.c (original)
+++ branches/12/utils/ael_main.c Tue Sep 10 12:25:02 2013
@@ -648,5 +648,11 @@
 {
 }
 #endif /* HAVE_BKTR */
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 #endif /* !defined(LOW_MEMORY) */
 #endif /* DEBUG_THREADS */

Modified: branches/12/utils/check_expr.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/check_expr.c?view=diff&rev=398750&r1=398749&r2=398750
==============================================================================
--- branches/12/utils/check_expr.c (original)
+++ branches/12/utils/check_expr.c Tue Sep 10 12:25:02 2013
@@ -105,12 +105,19 @@
 }
 #endif /* HAVE_BKTR */
 
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 void ast_mark_lock_acquired(void *);
 void ast_mark_lock_acquired(void *foo)
 {
     /* not a lot to do in a standalone w/o threading! */
 }
 #endif
+
 
 static int global_lineno = 1;
 static int global_expr_count=0;

Modified: branches/12/utils/conf2ael.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/utils/conf2ael.c?view=diff&rev=398750&r1=398749&r2=398750
==============================================================================
--- branches/12/utils/conf2ael.c (original)
+++ branches/12/utils/conf2ael.c Tue Sep 10 12:25:02 2013
@@ -777,5 +777,11 @@
 {
 }
 #endif /* HAVE_BKTR */
+void ast_suspend_lock_info(void *lock_addr)
+{
+}
+void ast_restore_lock_info(void *lock_addr)
+{
+}
 #endif /* !defined(LOW_MEMORY) */
 #endif /* DEBUG_THREADS */