Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/webkit-03-return.diff
author simonjin
Mon, 31 May 2010 08:36:21 +0000
changeset 2722 29423611b7fb
parent 2663 a8edf8722649
child 3325 33ece2659d50
permissions -rw-r--r--
fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2663
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
     1
 
diff -r d2a07bdc6744 JavaScriptCore/jsc.cpp
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
     2
 
--- a/JavaScriptCore/jsc.cpp	Tue May 18 19:09:56 2010 +0800
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
     3
 
+++ b/JavaScriptCore/jsc.cpp	Tue May 18 19:38:43 2010 +0800
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
     4
 
@@ -304,6 +304,10 @@
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
     5
 
     // 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 
     6
 
     return jsUndefined();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
     7
 
 #endif
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
     8
 
+
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
     9
 
+#if COMPILER(SUNCC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    10
 
+    return jsUndefined();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    11
 
+#endif
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    12
 
 }
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
 
 // Use SEH for Release builds only to get rid of the crash report dialog
2663
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
    15
 
diff -r d2a07bdc6744 JavaScriptCore/wtf/FastMalloc.cpp
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
    16
 
--- a/JavaScriptCore/wtf/FastMalloc.cpp	Tue May 18 19:09:56 2010 +0800
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
    17
 
+++ b/JavaScriptCore/wtf/FastMalloc.cpp	Tue May 18 19:38:43 2010 +0800
a8edf8722649 Remake patches
simonjin
parents: 2315
diff changeset 
    18
 
@@ -1495,7 +1495,7 @@
2315
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    19
 
 void* TCMalloc_PageHeap::runScavengerThread(void* context)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    20
 
 {
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    21
 
   static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    22
 
-#if COMPILER(MSVC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    23
 
+#if COMPILER(MSVC) || COMPILER(SUNCC)
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    24
 
   // 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 
    25
 
   return 0;
ef3e0baebb09 Bump webkit-cstd to 1.1.19
simonjin
parents:
diff changeset 
    26
 
 #endif
2722
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    27
 
diff -r 7f0899abd82d JavaScriptCore/wtf/FastMalloc.cpp
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    28
 
--- a/JavaScriptCore/wtf/FastMalloc.cpp	Fri May 21 01:19:20 2010 +0800
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    29
 
+++ b/JavaScriptCore/wtf/FastMalloc.cpp	Fri May 21 01:20:53 2010 +0800
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    30
 
@@ -3506,8 +3506,8 @@
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    31
 
   }
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    32
 
   if (!ret) {
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    33
 
 #ifdef WTF_CHANGES
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    34
 
-    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 
    35
 
-        CRASH();
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    36
 
+    //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 
    37
 
+     //   CRASH();
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    38
 
 #else
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    39
 
     errno = ENOMEM;
29423611b7fb fix d.o.o: Bug 16002 - webkitgtk 1.1.90 initialize failed
simonjin
parents: 2663
diff changeset 
    40
 
 #endif
upstream/spec-files-extra