diff options
| author | Steve Block <steveblock@google.com> | 2010-02-17 15:29:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-17 15:29:59 -0800 |
| commit | 2e837c8b6511f85209518f832e340662218eb3dc (patch) | |
| tree | cce9c39b321e698b000f1efb2de84e0a7f09ee40 | |
| parent | 468703355ff9a5448e0b32b0a7dbf4f1e44e18e6 (diff) | |
| parent | 30c46c59e64940591770e11ef8af75472dd06667 (diff) | |
| download | external_webkit-2e837c8b6511f85209518f832e340662218eb3dc.zip external_webkit-2e837c8b6511f85209518f832e340662218eb3dc.tar.gz external_webkit-2e837c8b6511f85209518f832e340662218eb3dc.tar.bz2 | |
Merge "Updates WebKit's use of cmath to expect isfinite, isinf, isnan and signbit to be in the std namespace"
| -rw-r--r-- | JavaScriptCore/wtf/MathExtras.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h index cd41f5f..8e93ee8 100644 --- a/JavaScriptCore/wtf/MathExtras.h +++ b/JavaScriptCore/wtf/MathExtras.h @@ -26,13 +26,7 @@ #ifndef WTF_MathExtras_h #define WTF_MathExtras_h -#if PLATFORM(ANDROID) -// cmath does not provide signbit in sim-eng builds. -// TODO: Find a better solution to this problem before upstreaming. -#include <math.h> -#else #include <cmath> -#endif #include <float.h> #include <stdlib.h> @@ -192,7 +186,9 @@ inline float deg2turn(float d) { return d / 360.0f; } inline float rad2grad(float r) { return r * 200.0f / piFloat; } inline float grad2rad(float g) { return g * piFloat / 200.0f; } -#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW) +// ANDROID +// TODO: Upstream to webkit.org +#if !COMPILER(MSVC) && !COMPILER(RVCT) && !COMPILER(WINSCW) using std::isfinite; using std::isinf; using std::isnan; |