[asterisk-commits] russell: trunk r129987 - in /trunk: ./ include/asterisk/astobj.h

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul 11 09:22:44 2008
New Revision: 129987

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129987
Log:
Merged revisions 129970 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r129970 | russell | 2008-07-11 09:18:43 -0500 (Fri, 11 Jul 2008) | 2 lines

add a simple ASTOBJ_TRYWRLOCK macro ...

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/astobj.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/astobj.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/astobj.h?view=diff&rev=129987&r1=129986&r2=129987
==============================================================================
--- trunk/include/asterisk/astobj.h (original)
+++ trunk/include/asterisk/astobj.h Fri Jul 11 09:22:44 2008
@@ -102,6 +102,8 @@
 /*! \brief Lock an ASTOBJ for writing.
  */
 #define ASTOBJ_WRLOCK(object) ast_mutex_lock(&(object)->_lock)
+
+#define ASTOBJ_TRYWRLOCK(object) ast_mutex_trylock(&(object)->_lock)
 
 /*! \brief Unlock a locked object. */
 #define ASTOBJ_UNLOCK(object) ast_mutex_unlock(&(object)->_lock)