diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2009-06-26 02:20:09 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2009-06-26 02:20:09 (GMT) |
| commit | 1e9b20cb6603b61f8d07a9f1da927dbf94f8525a (patch) | |
| tree | 95a2a56849806d12acc75c8902c1ee54a46ba871 /src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | |
| parent | e32bc79d9ab52e5b70e3cd27bddb2bec9c81f5a5 (diff) | |
| parent | db24e82b6b74be303492f186a45d784fcd84fdc6 (diff) | |
| download | Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.zip Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.tar.gz Qt-1e9b20cb6603b61f8d07a9f1da927dbf94f8525a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp index f114160..c65ba85 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp @@ -4089,7 +4089,7 @@ extern "C" { malloc_introspection_t jscore_fastmalloc_introspection = { &FastMallocZone::enumerate, &FastMallocZone::goodSize, &FastMallocZone::check, &FastMallocZone::print, &FastMallocZone::log, &FastMallocZone::forceLock, &FastMallocZone::forceUnlock, &FastMallocZone::statistics -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !PLATFORM(IPHONE) , 0 // zone_locked will not be called on the zone unless it advertises itself as version five or higher. #endif |