Title: [96363] trunk/Source/_javascript_Core
- Revision
- 96363
- Author
- [email protected]
- Date
- 2011-09-29 15:13:37 -0700 (Thu, 29 Sep 2011)
Log Message
Unreviewed windows build fix.
* assembler/MacroAssemblerCodeRef.h:
* dfg/DFGOperations.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96362 => 96363)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-29 22:02:37 UTC (rev 96362)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-29 22:13:37 UTC (rev 96363)
@@ -1,3 +1,10 @@
+2011-09-29 Gavin Barraclough <[email protected]>
+
+ Unreviewed windows build fix.
+
+ * assembler/MacroAssemblerCodeRef.h:
+ * dfg/DFGOperations.h:
+
2011-09-29 Filip Pizlo <[email protected]>
Structure transitions involving many (> 64) properties sometimes cause structure corruption
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (96362 => 96363)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-09-29 22:02:37 UTC (rev 96362)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-09-29 22:13:37 UTC (rev 96363)
@@ -52,7 +52,7 @@
#define ASSERT_VALID_CODE_OFFSET(offset) // Anything goes!
#endif
-#if CPU(X86) && !PLATFORM(WINDOWS)
+#if CPU(X86) && !PLATFORM(WIN)
#define CALLING_CONVENTION_IS_CDECL 1
#else
#define CALLING_CONVENTION_IS_CDECL 0
Modified: trunk/Source/_javascript_Core/dfg/DFGOperations.h (96362 => 96363)
--- trunk/Source/_javascript_Core/dfg/DFGOperations.h 2011-09-29 22:02:37 UTC (rev 96362)
+++ trunk/Source/_javascript_Core/dfg/DFGOperations.h 2011-09-29 22:13:37 UTC (rev 96363)
@@ -42,11 +42,9 @@
extern "C" {
-#if CPU(X86) && COMPILER(GCC)
+#if CALLING_CONVENTION_IS_CDECL
#define DFG_OPERATION __attribute__ ((stdcall))
-#endif
-
-#ifndef DFG_OPERATION
+#else
#define DFG_OPERATION
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
