diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-10-06 09:04:39 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-10-06 09:05:55 (GMT) |
| commit | 9225889d8958e71c8683df752ff2207c11334c9a (patch) | |
| tree | af90f0ab698afaf0f6a365bf5cce0dd8c5975aef | |
| parent | 9860745b1da588cae131f6ac9b568ce9676e050a (diff) | |
| download | Qt-9225889d8958e71c8683df752ff2207c11334c9a.zip Qt-9225889d8958e71c8683df752ff2207c11334c9a.tar.gz Qt-9225889d8958e71c8683df752ff2207c11334c9a.tar.bz2 | |
Prospective build fix for Solaris
"Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value."
| -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 |