Title: [96598] trunk/Source/_javascript_Core
- Revision
- 96598
- Author
- o...@webkit.org
- Date
- 2011-10-04 09:16:16 -0700 (Tue, 04 Oct 2011)
Log Message
MinGW warning fix after r96286.
Avoid redefining STDCALL, because STDCALL is also defined in mingw32/include/windef.h:
Reviewed by Tor Arne Vestbø.
* assembler/MacroAssemblerCodeRef.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96597 => 96598)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-04 16:11:59 UTC (rev 96597)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-04 16:16:16 UTC (rev 96598)
@@ -1,3 +1,15 @@
+2011-10-04 Csaba Osztrogonác <o...@webkit.org>
+
+ MinGW warning fix after r96286.
+
+ Avoid redefining STDCALL, because STDCALL is also defined in mingw32/include/windef.h:
+ #define __stdcall __attribute__((stdcall))
+ #define STDCALL __stdcall
+
+ Reviewed by Tor Arne Vestbø.
+
+ * assembler/MacroAssemblerCodeRef.h:
+
2011-10-04 Gavin Peters <gav...@chromium.org>
add more stack dumping methods
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h (96597 => 96598)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-10-04 16:11:59 UTC (rev 96597)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerCodeRef.h 2011-10-04 16:16:16 UTC (rev 96598)
@@ -107,7 +107,9 @@
}
#if CALLING_CONVENTION_IS_CDECL
+#ifndef STDCALL
#define STDCALL __attribute__ ((stdcall))
+#endif
template<typename returnType>
FunctionPtr(returnType (STDCALL *value)())
: m_value((void*)value)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
