patches/webkit-03-return.diff
author simonjin
Tue, 18 May 2010 04:08:25 +0000
changeset 2663 a8edf8722649
parent 2315 ef3e0baebb09
child 2722 29423611b7fb
permissions -rw-r--r--
Remake patches

diff -r d2a07bdc6744 JavaScriptCore/jsc.cpp
--- a/JavaScriptCore/jsc.cpp	Tue May 18 19:09:56 2010 +0800
+++ b/JavaScriptCore/jsc.cpp	Tue May 18 19:38:43 2010 +0800
@@ -304,6 +304,10 @@
     // Without this, Visual Studio will complain that this method does not return a value.
     return jsUndefined();
 #endif
+
+#if COMPILER(SUNCC)
+    return jsUndefined();
+#endif
 }
 
 // Use SEH for Release builds only to get rid of the crash report dialog
diff -r d2a07bdc6744 JavaScriptCore/wtf/FastMalloc.cpp
--- a/JavaScriptCore/wtf/FastMalloc.cpp	Tue May 18 19:09:56 2010 +0800
+++ b/JavaScriptCore/wtf/FastMalloc.cpp	Tue May 18 19:38:43 2010 +0800
@@ -1495,7 +1495,7 @@
 void* TCMalloc_PageHeap::runScavengerThread(void* context)
 {
   static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) || COMPILER(SUNCC)
   // Without this, Visual Studio will complain that this method does not return a value.
   return 0;
 #endif