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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9f5694a42cdc975ef1757b625329fd8c79d22db1
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 13:48:54 2010 +0000

    Don't import the cmath functions from std:: for WINSCW.
    
    Patch by Janne Koskinen <janne.p.koskinen at digia.com> on 2010-02-12
    Reviewed by Simon Hausmann.
    
    * wtf/MathExtras.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54722 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a4a91b0..5d5655e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-12  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Don't import the cmath functions from std:: for WINSCW.
+
+        * wtf/MathExtras.h:
+
 2010-02-12  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Adam Barth.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index 13bb566..8666724 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) && !OS(ANDROID)
+#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(ANDROID) && !COMPILER(WINSCW)
 using std::isfinite;
 using std::isinf;
 using std::isnan;

-- 
WebKit Debian packaging