diff options
| author | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:40:37 (GMT) |
| commit | 180d9189e8098d98848367f673fff723ddd1d068 (patch) | |
| tree | b052fb1b8361e962884f54aa4d6e6d8dd6f67e73 /src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | |
| parent | 18acf933474577a4cec31560eeee22de04111e1e (diff) | |
| parent | 0f6909e8e1be93d16798d31f18c4da2b0b5a084c (diff) | |
| download | Qt-180d9189e8098d98848367f673fff723ddd1d068.zip Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.gz Qt-180d9189e8098d98848367f673fff723ddd1d068.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp index a9472c9..6cd8ef0 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp @@ -379,6 +379,9 @@ extern "C" const int jscore_fastmalloc_introspection = 0; #include <stdarg.h> #include <stddef.h> #include <stdio.h> +#if PLATFORM(UNIX) +#include <unistd.h> +#endif #if COMPILER(MSVC) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -391,6 +394,7 @@ extern "C" const int jscore_fastmalloc_introspection = 0; #if PLATFORM(DARWIN) #include "MallocZoneSupport.h" #include <wtf/HashSet.h> +#include <wtf/Vector.h> #endif #ifndef PRIuS @@ -2274,7 +2278,7 @@ static inline TCMalloc_PageHeap* getPageHeap() #define pageheap getPageHeap() #if USE_BACKGROUND_THREAD_TO_SCAVENGE_MEMORY -#if PLATFORM(WIN) +#if PLATFORM(WIN_OS) static void sleep(unsigned seconds) { ::Sleep(seconds * 1000); |