diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 09:18:38 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 09:18:38 (GMT) |
| commit | 27d4a7e457b1e40e7cd19a179d3d932b1618b4fa (patch) | |
| tree | bea1d2f8e821ddf3abd032312b4309c373aa88a4 /src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp | |
| parent | d576d770b9b8251f1b5b4808a84045af33e62dba (diff) | |
| parent | 4e55bb8a761cc3e246c539fc5f7cce103ed4d730 (diff) | |
| download | Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.zip Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.gz Qt-27d4a7e457b1e40e7cd19a179d3d932b1618b4fa.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp index aa93252..fae056e 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSCell.cpp @@ -78,11 +78,7 @@ extern const double Inf = NaNInf.doubles.Inf_Double; void* JSCell::operator new(size_t size, ExecState* exec) { -#ifdef JAVASCRIPTCORE_BUILDING_ALL_IN_ONE_FILE - return exec->heap()->inlineAllocate(size); -#else return exec->heap()->allocate(size); -#endif } bool JSCell::getUInt32(uint32_t&) const |