[Pkg-telepathy-commits] [libnice] 151/265: agent: Replace recursive mutex with non-recursive

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 1deee69325284c726c3a8380a7d5839a51e20c48
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Feb 24 18:51:31 2014 -0500

    agent: Replace recursive mutex with non-recursive
    
    This should prevent us from re-adding re-entrancy in the future
---
 agent/agent.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index 021f0e7..4395f3b 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -127,9 +127,9 @@ enum
 static guint signals[N_SIGNALS];
 
 #if GLIB_CHECK_VERSION(2,31,8)
-static GRecMutex agent_mutex;    /* Mutex used for thread-safe lib */
+static GMutex agent_mutex;    /* Mutex used for thread-safe lib */
 #else
-static GStaticRecMutex agent_mutex = G_STATIC_REC_MUTEX_INIT;
+static GStaticMutex agent_mutex = G_STATIC_REC_MUTEX_INIT;
 #endif
 
 static void priv_free_upnp (NiceAgent *agent);
@@ -137,23 +137,23 @@ static void priv_free_upnp (NiceAgent *agent);
 #if GLIB_CHECK_VERSION(2,31,8)
 void agent_lock (void)
 {
-  g_rec_mutex_lock (&agent_mutex);
+  g_mutex_lock (&agent_mutex);
 }
 
 void agent_unlock (void)
 {
-  g_rec_mutex_unlock (&agent_mutex);
+  g_mutex_unlock (&agent_mutex);
 }
 
 #else
 void agent_lock(void)
 {
-  g_static_rec_mutex_lock (&agent_mutex);
+  g_static_mutex_lock (&agent_mutex);
 }
 
 void agent_unlock(void)
 {
-  g_static_rec_mutex_unlock (&agent_mutex);
+  g_static_mutex_unlock (&agent_mutex);
 }
 
 #endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git