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/qt47/qt-fastmalloc.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3064 6f76bdc54801
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3064
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     1
 
--- ./src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp.orig	2009-12-01 16:26:09.575151249 +0100
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     2
 
+++ ./src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp	2009-12-01 16:27:19.487955155 +0100
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     3
 
@@ -1431,10 +1431,7 @@
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     4
 
 void* TCMalloc_PageHeap::runScavengerThread(void* context)
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     5
 
 {
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     6
 
   static_cast<TCMalloc_PageHeap*>(context)->scavengerThread();
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     7
 
-#if COMPILER(MSVC)
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     8
 
-  // Without this, Visual Studio will complain that this method does not return a value.
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
     9
 
   return 0;
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    10
 
-#endif
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    11
 
 }
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    12
6f76bdc54801 experimental/SFEqt47: add 40 patches enabling WebKit etc.; create qmake.conf for solaris-cc-stdcxx
viskov
parents:
diff changeset 
    13
 
 void TCMalloc_PageHeap::scavenge()
upstream/spec-files-extra