diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-10-23 14:24:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-28 15:42:33 +0100 |
| commit | 92a17ec3ed87d86eee5dbea238bab3c3a00396e0 (patch) | |
| tree | a74f6b27f95aeeba5ff08c4350f075f0eba2adbf /Source/WebCore | |
| parent | f65ce030982a2ee743bb8adfab4423499d81f379 (diff) | |
Only use 64bit atomics when supported
To support Windows XP we must avoid using the 64bit variants of the
atomicIncrement/atomicDecrement operations which are only supported from
Windows 2003 and up.
This patch rolls back the minimum Win32 API version to WinNT 5.1 (32bit WinXP),
and adds a new flag to indicate the support of 64bit atomics.
The new flag is now also used to support MIPS and other architectures
without 64bit intrinsics, instead of hacking in poor support.
This also extends the atomic operations to sparc64 which was previously
skipped because it did not work with __exchange_and_add.
Task-number: QTBUG-34271
Change-Id: I21b09df3cafb7f0987a2f44c89036ff34ed34aa0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/WebCorePrefix.h | 9 | ||||
| -rw-r--r-- | Source/WebCore/config.h | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/Source/WebCore/WebCorePrefix.h b/Source/WebCore/WebCorePrefix.h index 543f50f61..575687226 100644 --- a/Source/WebCore/WebCorePrefix.h +++ b/Source/WebCore/WebCorePrefix.h @@ -38,15 +38,6 @@ #endif #if OS(WINDOWS) - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0502 -#endif - -#ifndef WINVER -#define WINVER 0x0502 -#endif - #if !USE(CURL) #ifndef _WINSOCKAPI_ #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h diff --git a/Source/WebCore/config.h b/Source/WebCore/config.h index 30bed8e6a..d0be35d94 100644 --- a/Source/WebCore/config.h +++ b/Source/WebCore/config.h @@ -47,15 +47,6 @@ #endif /* __APPLE__ */ #if OS(WINDOWS) - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0502 -#endif - -#ifndef WINVER -#define WINVER 0x0502 -#endif - // If we don't define these, they get defined in windef.h. // We want to use std::min and std::max. #ifndef max |