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

[sfalken at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4d0e1a92972d03f9fdc4a5a131b4ae4988c231ce
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 01:41:34 2010 +0000

    Windows build fix.
    
    * wtf/MathExtras.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 176608c..15708ee 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-04  Steve Falkenburg  <sfalken at apple.com>
+
+        Windows build fix.
+
+        * wtf/MathExtras.h:
+
 2010-02-04  Darin Adler  <darin at apple.com>
 
         Reviewed by David Levin.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index fb4b90a..4d6018e 100644
--- a/JavaScriptCore/wtf/MathExtras.h
+++ b/JavaScriptCore/wtf/MathExtras.h
@@ -186,9 +186,11 @@ 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)
 using std::isfinite;
 using std::isinf;
 using std::isnan;
 using std::signbit;
+#endif
 
 #endif // #ifndef WTF_MathExtras_h

-- 
WebKit Debian packaging