Changeset 58308 in webkit

Timestamp:

Apr 27, 2010 6:56:53 AM (14 years ago)

Author:

jocelyn.turcotte@nokia.com

Message:

Compile fix for Visual Studio 2010
​https://bugs.webkit.org/show_bug.cgi?id=37867

Reviewed by Simon Hausmann.

Patch by Prasanth Ullattil <​prasanth.ullattil@nokia.com>

• runtime/Structure.cpp:

(JSC::Structure::transitionTableAdd):

• wtf/MathExtras.h:
• wtf/Platform.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Structure.cpp (modified) (2 diffs)
• wtf/MathExtras.h (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-04-21  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Compile fix for Visual Studio 2010
+        https://bugs.webkit.org/show_bug.cgi?id=37867
+
+        Patch by Prasanth Ullattil <prasanth.ullattil@nokia.com>
+
+        * runtime/Structure.cpp:
+        (JSC::Structure::transitionTableAdd):
+        * wtf/MathExtras.h:
+        * wtf/Platform.h:
+
 2010-04-27  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/JavaScriptCore/runtime/Structure.cpp

@@ -169 +169 @@
         TransitionTable::iterator find = transitionTable()->find(key);
         if (find == transitionTable()->end())
-            transitionTable()->add(key, Transition(structure, 0));
+            transitionTable()->add(key, Transition(structure, static_cast<Structure*>(0)));
         else
             find->second.first = structure;
@@ -176 +176 @@
         // an existing transition
         ASSERT(!transitionTable()->contains(key));
-        transitionTable()->add(key, Transition(0, structure));
+        transitionTable()->add(key, Transition(static_cast<Structure*>(0), structure));
     }
 }

trunk/JavaScriptCore/wtf/MathExtras.h

@@ -123 +123 @@
 
 #if COMPILER(MSVC)
-
+// The 64bit version of abs() is already defined in stdlib.h which comes with VC10
+#if COMPILER(MSVC9_OR_LOWER)
 inline long long abs(long long num) { return _abs64(num); }
+#endif
 
 inline bool isinf(double num) { return !_finite(num) && !_isnan(num); }

trunk/JavaScriptCore/wtf/Platform.h

@@ -60 +60 @@
 /* COMPILER(MSVC) Microsoft Visual C++ */
 /* COMPILER(MSVC7_OR_LOWER) Microsoft Visual C++ 2003 or lower*/
+/* COMPILER(MSVC9_OR_LOWER) Microsoft Visual C++ 2008 or lower*/
 #if defined(_MSC_VER)
 #define WTF_COMPILER_MSVC 1
 #if _MSC_VER < 1400
 #define WTF_COMPILER_MSVC7_OR_LOWER 1
+#elif _MSC_VER < 1600
+#define WTF_COMPILER_MSVC9_OR_LOWER 1
 #endif
 #endif