From 23c8aa8b523d32c8813834bd979b81cf0dd5c775 Mon Sep 17 00:00:00 2001 From: Jan-Ivar Bruaroey Date: Fri, 29 Jul 2016 20:03:35 -0400 Subject: [PATCH] Bug 1290625 - Make libcubeb mutex recurse again, to avoid deadlock when getting microphone. r=achronop MozReview-Commit-ID: AvYa8ylsdOf --HG-- extra : rebase_source : 111b2954a089fcacc530f7d9babed5de298b5b78 --- media/libcubeb/src/cubeb_utils_unix.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/media/libcubeb/src/cubeb_utils_unix.h b/media/libcubeb/src/cubeb_utils_unix.h index 72041f55ec99..643306e14157 100644 --- a/media/libcubeb/src/cubeb_utils_unix.h +++ b/media/libcubeb/src/cubeb_utils_unix.h @@ -20,11 +20,7 @@ public: { pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); -#ifdef DEBUG - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); -#else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); -#endif + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); #ifdef DEBUG int r =