diff options
| author | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
|---|---|---|
| committer | João Abecasis <joao@abecasis.name> | 2009-11-05 15:18:52 (GMT) |
| commit | ad3e723c334d72b746979b284910ac9b698b2d0b (patch) | |
| tree | 28fa320fcbd38938345f30817d75f19716c4e534 /src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp | |
| parent | c4d8d7fd35c8ac7fd2c14208e5e7ca0a35c101e1 (diff) | |
| parent | 4cd683231190443e5243f66098c7322e3808a131 (diff) | |
| download | Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.zip Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.gz Qt-ad3e723c334d72b746979b284910ac9b698b2d0b.tar.bz2 | |
Merge commit 'origin/4.6' into large-file-support
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp index e4fb419..6cad5e3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -167,6 +167,7 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con if (pthread_create(&threadHandle, 0, runThreadWithRegistration, static_cast<void*>(threadData))) { LOG_ERROR("Failed to create pthread at entry point %p with data %p", entryPoint, data); + delete threadData; return 0; } return establishIdentifierForPthreadHandle(threadHandle); @@ -270,7 +271,7 @@ void Mutex::unlock() ASSERT_UNUSED(result, !result); } - +#if HAVE(PTHREAD_RWLOCK) ReadWriteLock::ReadWriteLock() { pthread_rwlock_init(&m_readWriteLock, NULL); @@ -324,6 +325,7 @@ void ReadWriteLock::unlock() int result = pthread_rwlock_unlock(&m_readWriteLock); ASSERT_UNUSED(result, !result); } +#endif // HAVE(PTHREAD_RWLOCK) ThreadCondition::ThreadCondition() { |