patches/webkit-03-return.diff
author simonjin
Mon, 25 Jan 2010 08:58:52 +0000
changeset 2315 ef3e0baebb09
child 2663 a8edf8722649
permissions -rw-r--r--
Bump webkit-cstd to 1.1.19
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     1
diff --git a/JavaScriptCore/jsc.cpp b/JavaScriptCore/jsc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     2
index 252fb96..e24f81a 100644
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     3
--- a/JavaScriptCore/jsc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     4
+++ b/JavaScriptCore/jsc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     5
@@ -304,6 +304,10 @@ JSValue JSC_HOST_CALL functionQuit(ExecState* exec, JSObject*, JSValue, const Ar
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     6
     // Without this, Visual Studio will complain that this method does not return a value.
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     7
     return jsUndefined();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     8
 #endif
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
     9
+
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    10
+#if COMPILER(SUNCC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    11
+    return jsUndefined();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    12
+#endif
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    13
 }
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    14
 
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    15
 // Use SEH for Release builds only to get rid of the crash report dialog
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    16
diff --git a/JavaScriptCore/wtf/FastMalloc.cpp b/JavaScriptCore/wtf/FastMalloc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    17
index c834212..26f2f1c 100644
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    18
--- a/JavaScriptCore/wtf/FastMalloc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    19
+++ b/JavaScriptCore/wtf/FastMalloc.cpp
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    20
@@ -1426,7 +1426,7 @@ void TCMalloc_PageHeap::init()
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    21
 void* TCMalloc_PageHeap::runScavengerThread(void* context)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    22
 {
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    23
   static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    24
-#if COMPILER(MSVC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    25
+#if COMPILER(MSVC) || COMPILER(SUNCC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    26
   // Without this, Visual Studio will complain that this method does not return a value.
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    27
   return 0;
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset
    28
 #endif