From ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 24 Feb 2012 16:36:50 +0100 Subject: Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790) --- Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp') diff --git a/Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp b/Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp index fd5b1f847..2cc0bc643 100644 --- a/Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp +++ b/Source/JavaScriptCore/wtf/ParallelJobsGeneric.cpp @@ -121,7 +121,7 @@ void ParallelEnvironment::ThreadPrivate::waitForFinish() m_threadCondition.wait(m_mutex); } -void* ParallelEnvironment::ThreadPrivate::workerThread(void* threadData) +void ParallelEnvironment::ThreadPrivate::workerThread(void* threadData) { ThreadPrivate* sharedThread = reinterpret_cast(threadData); MutexLocker lock(sharedThread->m_mutex); @@ -136,7 +136,6 @@ void* ParallelEnvironment::ThreadPrivate::workerThread(void* threadData) sharedThread->m_threadCondition.wait(sharedThread->m_mutex); } - return 0; } } // namespace WTF -- cgit v1.2.1