author | jurikm |
Sun, 20 Mar 2011 14:25:20 +0000 | |
changeset 3325 | 33ece2659d50 |
parent 2722 | 29423611b7fb |
permissions | -rw-r--r-- |
3325 | 1 |
--- webkit-1.2.7/JavaScriptCore/jsc.cpp Fri Sep 10 15:20:23 2010 |
2 |
+++ webkit-1.2.7-patch/JavaScriptCore/jsc.cpp Sat Mar 19 23:02:18 2011 |
|
2663 | 3 |
@@ -304,6 +304,10 @@ |
2315 | 4 |
// Without this, Visual Studio will complain that this method does not return a value. |
5 |
return jsUndefined(); |
|
6 |
#endif |
|
7 |
+ |
|
8 |
+#if COMPILER(SUNCC) |
|
9 |
+ return jsUndefined(); |
|
10 |
+#endif |
|
11 |
} |
|
12 |
||
13 |
// Use SEH for Release builds only to get rid of the crash report dialog |
|
3325 | 14 |
--- webkit-1.2.7/JavaScriptCore/wtf/FastMalloc.cpp Fri Sep 10 15:20:23 2010 |
15 |
+++ webkit-1.2.7-patch/JavaScriptCore/wtf/FastMalloc.cpp Sat Mar 19 23:02:18 2011 |
|
16 |
@@ -1499,7 +1499,7 @@ |
|
2315 | 17 |
void* TCMalloc_PageHeap::runScavengerThread(void* context) |
18 |
{ |
|
19 |
static_cast<TCMalloc_PageHeap*>(context)->scavengerThread(); |
|
20 |
-#if COMPILER(MSVC) |
|
21 |
+#if COMPILER(MSVC) || COMPILER(SUNCC) |
|
22 |
// Without this, Visual Studio will complain that this method does not return a value. |
|
23 |
return 0; |
|
24 |
#endif |
|
2722
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
25 |
@@ -3506,8 +3506,8 @@ |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
26 |
} |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
27 |
if (!ret) { |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
28 |
#ifdef WTF_CHANGES |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
29 |
- if (crashOnFailure) // This branch should be optimized out by the compiler. |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
30 |
- CRASH(); |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
31 |
+ //if (crashOnFailure) // This branch should be optimized out by the compiler. |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
32 |
+ // CRASH(); |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
33 |
#else |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
34 |
errno = ENOMEM; |
29423611b7fb
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents:
2663
diff
changeset
|
35 |
#endif |