diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 16:43:22 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 17:02:05 +0200 |
| commit | 01335edc94d2961bd4061ed2cb81ebd1151797bf (patch) | |
| tree | 54df7d2d0857278198258e4d8a65bf63cb35d91a /src/3rdparty/javascriptcore/DateMath.cpp | |
| parent | 20c3575fc39004d6a556820543982f4a6ebef0be (diff) | |
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings.
Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore/DateMath.cpp')
| -rw-r--r-- | src/3rdparty/javascriptcore/DateMath.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/3rdparty/javascriptcore/DateMath.cpp b/src/3rdparty/javascriptcore/DateMath.cpp index 11c224aebb..e4775273e2 100644 --- a/src/3rdparty/javascriptcore/DateMath.cpp +++ b/src/3rdparty/javascriptcore/DateMath.cpp @@ -75,6 +75,7 @@ #include <limits> #include <stdint.h> #include <time.h> +#include <math.h> //#if HAVE(SYS_TIME_H) #if defined(EXISTS_SYS_TIME) @@ -340,11 +341,15 @@ static const struct KnownZone { double timeClip(double t) { - if (!isfinite(t)) - return NaN; - if (fabs(t) > maxECMAScriptTime) +#if defined(_MSC_VER) + if (!_finite(t) || fabs(t) > maxECMAScriptTime) + return NaN; + return t >= 0 ? floor(t) : ceil(t); +#else + if (!isfinite(t) || fabs(t) > maxECMAScriptTime) return NaN; return trunc(t); +#endif } } // namespace WTF |