2315
|
1 |
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp
|
|
2 |
index 252fb96..e24f81a 100644
|
|
3 |
--- a/JavaScriptCore/jsc.cpp
|
|
4 |
+++ b/JavaScriptCore/jsc.cpp
|
|
5 |
@@ -304,6 +304,10 @@ JSValue JSC_HOST_CALL functionQuit(ExecState* exec, JSObject*, JSValue, const Ar
|
|
6 |
// Without this, Visual Studio will complain that this method does not return a value.
|
|
7 |
return jsUndefined();
|
|
8 |
#endif
|
|
9 |
+
|
|
10 |
+#if COMPILER(SUNCC)
|
|
11 |
+ return jsUndefined();
|
|
12 |
+#endif
|
|
13 |
}
|
|
14 |
|
|
15 |
// Use SEH for Release builds only to get rid of the crash report dialog
|
|
16 |
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
|
|
17 |
index c834212..26f2f1c 100644
|
|
18 |
--- a/JavaScriptCore/wtf/FastMalloc.cpp
|
|
19 |
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
|
|
20 |
@@ -1426,7 +1426,7 @@ void TCMalloc_PageHeap::init()
|
|
21 |
void* TCMalloc_PageHeap::runScavengerThread(void* context)
|
|
22 |
{
|
|
23 |
static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
|
|
24 |
-#if COMPILER(MSVC)
|
|
25 |
+#if COMPILER(MSVC) || COMPILER(SUNCC)
|
|
26 |
// Without this, Visual Studio will complain that this method does not return a value.
|
|
27 |
return 0;
|
|
28 |
#endif
|