[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 307c21740446962d81b97e03690bd65215fd0b38
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 09:33:12 2010 +0000

    Unreviewed RVCT build fix.
    
    Similar to r54391, don't import the cmath functions from std:: for RVCT.
    
    * wtf/MathExtras.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54476 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 949605f..50fd725 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-08  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Unreviewed RVCT build fix.
+
+        Similar to r54391, don't import the cmath functions from std:: for RVCT.
+
+        * wtf/MathExtras.h:
+
 2010-02-05  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Geoff Garen.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index 4d6018e..48b5f12 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)
+#if !COMPILER(MSVC) && !COMPILER(RVCT)
 using std::isfinite;
 using std::isinf;
 using std::isnan;

-- 
WebKit Debian packaging