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;