diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-18 18:14:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 23:56:18 +0200 |
| commit | d4a6abc1b18d65a2bd665cdda10cedd97a98c249 (patch) | |
| tree | 1809712a95418c814a615d647f6f2b8211c912dc /Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp | |
| parent | 2761751ecaf61064c3742c639a37f110120e8292 (diff) | |
| download | qtwebkit-d4a6abc1b18d65a2bd665cdda10cedd97a98c249.tar.gz | |
Fix build for boot2qt eAndroid
Reverts the removal of Android support in WTF, and brings the support
up to date.
Merged change to MacroAssemblerARM.cpp from QtScript.
Replaces use of statvfs with statfs in one place.
Replaces shm-based shared memory with ashmem-based in WebKit2.
Change-Id: I440b1fbd94bb4148f7ba764d77de65230d13ed90
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp')
| -rw-r--r-- | Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp b/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp index bd62288f8..4ad20c8bc 100644 --- a/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp +++ b/Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp @@ -36,7 +36,7 @@ #include "Threading.h" -#if OS(HURD) +#if OS(ANDROID) || OS(HURD) // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here. #define PTHREAD_KEYS_MAX 1024 #else |