diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-24 16:36:50 +0100 |
commit | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (patch) | |
tree | b34b0daceb7c8e7fdde4b4ec43650ab7caadb0a9 /Source/JavaScriptCore/wtf/ThreadingWin.cpp | |
parent | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (diff) | |
download | qtwebkit-ad0d549d4cc13433f77c1ac8f0ab379c83d93f28.tar.gz |
Imported WebKit commit bb52bf3c0119e8a128cd93afe5572413a8617de9 (http://svn.webkit.org/repository/webkit/trunk@108790)
Diffstat (limited to 'Source/JavaScriptCore/wtf/ThreadingWin.cpp')
-rw-r--r-- | Source/JavaScriptCore/wtf/ThreadingWin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/JavaScriptCore/wtf/ThreadingWin.cpp b/Source/JavaScriptCore/wtf/ThreadingWin.cpp index ac0f73f19..bc32262ce 100644 --- a/Source/JavaScriptCore/wtf/ThreadingWin.cpp +++ b/Source/JavaScriptCore/wtf/ThreadingWin.cpp @@ -210,14 +210,14 @@ static void clearThreadHandleForIdentifier(ThreadIdentifier id) static unsigned __stdcall wtfThreadEntryPoint(void* param) { OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param)); - void* result = invocation->function(invocation->data); + invocation->function(invocation->data); #if !USE(PTHREADS) && OS(WINDOWS) // Do the TLS cleanup. ThreadSpecificThreadExit(); #endif - return reinterpret_cast<unsigned>(result); + return 0; } ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char* threadName) @@ -252,7 +252,7 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con return threadID; } -int waitForThreadCompletion(ThreadIdentifier threadID, void** result) +int waitForThreadCompletion(ThreadIdentifier threadID) { ASSERT(threadID); |