Title: [96288] trunk/Source/_javascript_Core
Revision
96288
Author
[email protected]
Date
2011-09-28 19:32:53 -0700 (Wed, 28 Sep 2011)

Log Message

Build fix attempt for r96286.

* assembler/MacroAssemblerCodeRef.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (96287 => 96288)


--- trunk/Source/_javascript_Core/ChangeLog	2011-09-29 02:27:29 UTC (rev 96287)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-09-29 02:32:53 UTC (rev 96288)
@@ -1,3 +1,9 @@
+2011-09-28  Ryosuke Niwa  <[email protected]>
+
+        Build fix attempt for r96286.
+
+        * assembler/MacroAssemblerCodeRef.h:
+
 2011-09-28  Gavin Barraclough  <[email protected]>
 
         DFG JIT Operations on 32_64 should use stdcall calling convention.

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (96287 => 96288)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h	2011-09-29 02:27:29 UTC (rev 96287)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h	2011-09-29 02:32:53 UTC (rev 96288)
@@ -71,6 +71,8 @@
     {
     }
 
+#if !CALLING_CONVENTION_IS_CDECL
+
     template<typename returnType>
     FunctionPtr(returnType(*value)())
         : m_value((void*)value)
@@ -106,7 +108,7 @@
         ASSERT_VALID_CODE_POINTER(m_value);
     }
 
-#ifdef CALLING_CONVENTION_IS_CDECL
+#else
 #define STDCALL __attribute__ ((stdcall))
     template<typename returnType>
     FunctionPtr(returnType STDCALL(*value)())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to