diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
| commit | 2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch) | |
| tree | 03e166e8393e1928ec5ed3c79c96fa0accd11460 /src/3rdparty/webkit/JavaScriptCore/wtf/FastMalloc.cpp | |
| parent | e1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2 | |
Merge commit 'origin/4.6' into core-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); |