diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-04-12 20:50:43 +0530 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-17 20:29:10 +0200 |
| commit | 45d0c506683f98cc981dc2623960334776d11c3c (patch) | |
| tree | df62780abad91723d8645ad6a139333682950c3a /src/3rdparty/webkit | |
| parent | 1bed55097b22f2071af71ebefc9897816977fd14 (diff) | |
Fix compilation of QtWebKit with MSVC 2013
Starting with MSVC 2013, more functions are provided.
Task-number: QTBUG-34705
Change-Id: I85e35a2486e0bd556f5f16e5911cca5c364273ed
(adapted from commit qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h index b66c6f594a..4fbfa88941 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/MathExtras.h @@ -110,7 +110,7 @@ inline bool signbit(double x) { struct ieee_double *p = (struct ieee_double *)&x #endif -#if COMPILER(MSVC) || (COMPILER(RVCT) && !(RVCT_VERSION_AT_LEAST(3, 0, 0, 0))) +#if (COMPILER(MSVC) && _MSC_VER < 1800) || (COMPILER(RVCT) && !(RVCT_VERSION_AT_LEAST(3, 0, 0, 0))) // We must not do 'num + 0.5' or 'num - 0.5' because they can cause precision loss. static double round(double num) @@ -135,7 +135,7 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); } #endif -#if COMPILER(MSVC) +#if COMPILER(MSVC) && _MSC_VER < 1800 // The 64bit version of abs() is already defined in stdlib.h which comes with VC10 #if COMPILER(MSVC9_OR_LOWER) inline long long abs(long long num) { return _abs64(num); } |