diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-06 09:04:39 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-07 02:37:39 (GMT) |
| commit | 44adc4509a6561ec89b3a169489f0936a17c32a9 (patch) | |
| tree | 2edd349d55e5783f77d4328c73e505ba6e73ed76 | |
| parent | 130c11f50c0a1992f0a2fe5ff844191ee097c6f8 (diff) | |
| download | Qt-44adc4509a6561ec89b3a169489f0936a17c32a9.zip Qt-44adc4509a6561ec89b3a169489f0936a17c32a9.tar.gz Qt-44adc4509a6561ec89b3a169489f0936a17c32a9.tar.bz2 | |
Prospective build fix for Solaris
"Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value."
(cherry picked from commit 9225889d8958e71c8683df752ff2207c11334c9a)
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp index 6cd8ef0..f2148d0 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp @@ -1431,7 +1431,7 @@ void TCMalloc_PageHeap::init() void* TCMalloc_PageHeap::runScavengerThread(void* context) { static_cast<TCMalloc_PageHeap*>(context)->scavengerThread(); -#if COMPILER(MSVC) +#if COMPILER(MSVC) || PLATFORM(SOLARIS) // Without this, Visual Studio will complain that this method does not return a value. return 0; #endif |