[asterisk-commits] russell: branch 1.6.0 r130637 - in /branches/1.6.0: ./ include/asterisk/astobj.h

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jul 14 05:40:53 2008
New Revision: 130637

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

................
r129987 | russell | 2008-07-11 09:22:44 -0500 (Fri, 11 Jul 2008) | 10 lines

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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/include/asterisk/astobj.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/include/asterisk/astobj.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/astobj.h?view=diff&rev=130637&r1=130636&r2=130637
==============================================================================
--- branches/1.6.0/include/asterisk/astobj.h (original)
+++ branches/1.6.0/include/asterisk/astobj.h Mon Jul 14 05:40:53 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)