From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 15 Jun 2010 19:36:43 +0100 Subject: Merge webkit.org at r61121: Initial merge by git. Change-Id: Icd6db395c62285be384d137164d95d7466c98760 --- JavaScriptCore/wtf/ThreadingPthreads.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'JavaScriptCore/wtf/ThreadingPthreads.cpp') diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index 7ff9266..d01cc4a 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -235,7 +235,21 @@ ThreadIdentifier currentThread() Mutex::Mutex() { - pthread_mutex_init(&m_mutex, NULL); +#if PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_DEFAULT + + pthread_mutex_init(&m_mutex, 0); + +#else + + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL); + + pthread_mutex_init(&m_mutex, &attr); + + pthread_mutexattr_destroy(&attr); + +#endif } Mutex::~Mutex() -- cgit v1.1