[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[steveblock at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit 78a6ef41214708658a36f103ff27649a596d7bd8
Author: steveblock at google.com <steveblock at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 16:03:40 2010 +0000

    Guard cmath using declarations in MathExtras.h on Android
    https://bugs.webkit.org/show_bug.cgi?id=34840
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 58d73e4..e10a0cd 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-11  Steve Block  <steveblock at google.com>
+
+        Reviewed by Darin Adler.
+
+        Guard cmath using declarations in MathExtras.h on Android
+        https://bugs.webkit.org/show_bug.cgi?id=34840
+
+        Android does not provide these functions.
+
+        * wtf/MathExtras.h:
+
 2010-02-08  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Cameron Zwarich.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index 48b5f12..13bb566 100644
--- a/JavaScriptCore/wtf/MathExtras.h
+++ b/JavaScriptCore/wtf/MathExtras.h
@@ -186,7 +186,7 @@ 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)
+#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID)
 using std::isfinite;
 using std::isinf;
 using std::isnan;

-- 
WebKit Debian packaging