[asterisk-commits] dlee: trunk r398751 - in /trunk: ./ utils/

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Sep 10 12:26:19 2013
New Revision: 398751

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

Merged revisions 398750 from http://svn.asterisk.org/svn/asterisk/branches/12

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Tue Sep 10 12:26:19 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-398651,398694,398726
+/branches/12:1-398558,398560-398577,398579-398750

Modified: trunk/utils/ael_main.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/ael_main.c?view=diff&rev=398751&r1=398750&r2=398751
==============================================================================
--- trunk/utils/ael_main.c (original)
+++ trunk/utils/ael_main.c Tue Sep 10 12:26:19 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: trunk/utils/check_expr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/check_expr.c?view=diff&rev=398751&r1=398750&r2=398751
==============================================================================
--- trunk/utils/check_expr.c (original)
+++ trunk/utils/check_expr.c Tue Sep 10 12:26:19 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: trunk/utils/conf2ael.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/conf2ael.c?view=diff&rev=398751&r1=398750&r2=398751
==============================================================================
--- trunk/utils/conf2ael.c (original)
+++ trunk/utils/conf2ael.c Tue Sep 10 12:26:19 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 */