From 0ea127b043afdecf8e46b1075f523c66f14f4f27 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Mon, 14 Jul 2008 10:40:53 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130637 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/astobj.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/asterisk/astobj.h b/include/asterisk/astobj.h index 1d302d38a8..fe903201d6 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)