diff options
| author | Steve Block <steveblock@google.com> | 2010-04-22 20:55:32 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-04-22 20:55:32 +0100 |
| commit | 9971b753e340168e8b8c26aa0c119b57727526c6 (patch) | |
| tree | 5613f0ac4b2ea38c5c60ab79c9cda35ddb0f0169 /JavaScriptCore/wtf | |
| parent | a0584f084721f17a0d034361a414cfb4e65736a6 (diff) | |
| download | external_webkit-9971b753e340168e8b8c26aa0c119b57727526c6.zip external_webkit-9971b753e340168e8b8c26aa0c119b57727526c6.tar.gz external_webkit-9971b753e340168e8b8c26aa0c119b57727526c6.tar.bz2 | |
Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamed
Android's stlport now provides isinf etc. in the std namespace (see
https://android-git.corp.google.com/g/41036). This allows us to remove the
Android special-case from MathExtras.h (see
https://android-git.corp.google.com/g/41037).
This change has now been upstreamed in http://trac.webkit.org/changeset/58110
so we can remove the ANDROID guard marking this change.
Change-Id: I7c06a5a5a8f9a0a7909a649e68424688bf02893a
Diffstat (limited to 'JavaScriptCore/wtf')
| -rw-r--r-- | JavaScriptCore/wtf/MathExtras.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h index 8e93ee8..089e8ff 100644 --- a/JavaScriptCore/wtf/MathExtras.h +++ b/JavaScriptCore/wtf/MathExtras.h @@ -186,8 +186,6 @@ 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; } -// ANDROID -// TODO: Upstream to webkit.org #if !COMPILER(MSVC) && !COMPILER(RVCT) && !COMPILER(WINSCW) using std::isfinite; using std::isinf; |