Title: [96293] trunk/Source/_javascript_Core
- Revision
- 96293
- Author
- [email protected]
- Date
- 2011-09-28 21:00:01 -0700 (Wed, 28 Sep 2011)
Log Message
Build fix pt 2 for r96286.
* assembler/MacroAssemblerCodeRef.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96292 => 96293)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-29 03:57:39 UTC (rev 96292)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-29 04:00:01 UTC (rev 96293)
@@ -1,3 +1,9 @@
+2011-09-28 Gavin Barraclough <[email protected]>
+
+ Build fix pt 2 for r96286.
+
+ * assembler/MacroAssemblerCodeRef.h:
+
2011-09-28 Ryosuke Niwa <[email protected]>
Build fix attempt for r96286.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (96292 => 96293)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-09-29 03:57:39 UTC (rev 96292)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-09-29 04:00:01 UTC (rev 96293)
@@ -71,8 +71,6 @@
{
}
-#if !CALLING_CONVENTION_IS_CDECL
-
template<typename returnType>
FunctionPtr(returnType(*value)())
: m_value((void*)value)
@@ -108,7 +106,7 @@
ASSERT_VALID_CODE_POINTER(m_value);
}
-#else
+#if CALLING_CONVENTION_IS_CDECL
#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
