diff options
| author | Steve Block <steveblock@google.com> | 2010-02-17 17:08:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-17 18:21:54 +0000 |
| commit | 30c46c59e64940591770e11ef8af75472dd06667 (patch) | |
| tree | 0eb15f201678314574b129c8f4e0b628b5ed0b2c /JavaScriptCore/wtf | |
| parent | 9554d8b5dc5367d3e738ebc9ade01331d6d23136 (diff) | |
| download | external_webkit-30c46c59e64940591770e11ef8af75472dd06667.zip external_webkit-30c46c59e64940591770e11ef8af75472dd06667.tar.gz external_webkit-30c46c59e64940591770e11ef8af75472dd06667.tar.bz2 | |
Updates WebKit's use of cmath to expect isfinite, isinf, isnan and signbit to be in the std namespace
This follows a change to stlport to move these functions to the std namespace to match the simulator build.
Change-Id: I7839a857520239610bb6403323fc29adb613d0c2
Diffstat (limited to 'JavaScriptCore/wtf')
| -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; |