[asterisk-commits] russell: branch russell/chan_refcount r100242 - /team/russell/chan_refcount/i...

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jan 24 13:17:53 2008
New Revision: 100242

URL: http://svn.digium.com/view/asterisk?view=rev&rev=100242
Log:
Change channel lock wrappers to macros so that lock debug info doesn't always
show channel.h as the location the object was locked

Modified:
    team/russell/chan_refcount/include/asterisk/channel.h

Change Statistics:
 0 files changed

Modified: team/russell/chan_refcount/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/include/asterisk/channel.h?view=diff&rev=100242&r1=100241&r2=100242
==============================================================================
--- team/russell/chan_refcount/include/asterisk/channel.h (original)
+++ team/russell/chan_refcount/include/asterisk/channel.h Thu Jan 24 13:17:53 2008
@@ -1613,26 +1613,11 @@
         AST_LIST_ENTRY(ast_group_info) list;   
 };
 
-static force_inline int ast_channel_lock(struct ast_channel *chan)
-{
-	return ao2_lock(chan);
-}
-
-static force_inline int ast_channel_unlock(struct ast_channel *chan)
-{
-	return ao2_unlock(chan);
-}
-
-static force_inline int ast_channel_trylock(struct ast_channel *chan)
-{
-	return ao2_trylock(chan);
-}
-
-static force_inline int ast_channel_lock_both(struct ast_channel *chan1,
-	struct ast_channel *chan2)
-{
-	return ao2_lock_both(chan1, chan2);
-}
+#define ast_channel_lock(chan) ao2_lock(chan)
+#define ast_channel_unlock(chan) ao2_unlock(chan)
+#define ast_channel_trylock(chan) ao2_trylock(chan)
+
+#define ast_channel_lock_both(c1, c2) ao2_lock_both(c1, c2)
 
 static force_inline struct ast_channel *ast_channel_ref(struct ast_channel *chan)
 {