diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
| commit | a8e0e5656f09130e68c10209429a0870b38248c4 (patch) | |
| tree | 9f2c51be485c3f1e4afea821ebbe838a08c0ce2d /src/3rdparty/webkit/JavaScriptCore/wtf/ThreadingPthreads.cpp | |
| parent | 8fbdbd25015a4e5544dace3a77427861f0ca89f4 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-a8e0e5656f09130e68c10209429a0870b38248c4.zip Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.gz Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.bz2 | |
Merge branch '4.6' into core-4.6
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() { |