aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-14 10:40:53 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-14 10:40:53 +0000
commit5fe4c64e79aa9bb2c52f22e8105d9deff985dddd (patch)
tree7ebe9b2b27f1d8f6b86cc050a0696a25f8b56c54 /include
parent48db5f3678935cdc13a4bd3b9fc7aad7cac84c49 (diff)
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 ... ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130637 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/astobj.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h
index 1d302d38a..fe903201d 100644
--- a/include/asterisk/astobj.h
+++ b/include/asterisk/astobj.h
@@ -103,6 +103,8 @@ extern "C" {
*/
#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)