Title: [101484] trunk/Source/_javascript_Core
- Revision
- 101484
- Author
- hausm...@webkit.org
- Date
- 2011-11-30 04:05:54 -0800 (Wed, 30 Nov 2011)
Log Message
Fix compilation with MingW.
Reviewed by Csaba Osztrogonác.
* wtf/ThreadingWin.cpp:
(WTF::initializeCurrentThreadInternal): MingW doesn't support MSVC exception handling, so for
the time being make the thread name setting unimplemented for MingW.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (101483 => 101484)
--- trunk/Source/_javascript_Core/ChangeLog 2011-11-30 11:50:43 UTC (rev 101483)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-11-30 12:05:54 UTC (rev 101484)
@@ -1,5 +1,15 @@
2011-11-30 Simon Hausmann <simon.hausm...@nokia.com>
+ Fix compilation with MingW.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * wtf/ThreadingWin.cpp:
+ (WTF::initializeCurrentThreadInternal): MingW doesn't support MSVC exception handling, so for
+ the time being make the thread name setting unimplemented for MingW.
+
+2011-11-30 Simon Hausmann <simon.hausm...@nokia.com>
+
Unreviewed propective build fix for Qt/Windows part 2 after r101477.
* wtf/ThreadSpecific.h: Fix the OS(WINDOWS) defines for the friend declaration for ThreadSpecific<T>::Data
Modified: trunk/Source/_javascript_Core/wtf/ThreadingWin.cpp (101483 => 101484)
--- trunk/Source/_javascript_Core/wtf/ThreadingWin.cpp 2011-11-30 11:50:43 UTC (rev 101483)
+++ trunk/Source/_javascript_Core/wtf/ThreadingWin.cpp 2011-11-30 12:05:54 UTC (rev 101484)
@@ -128,6 +128,10 @@
void initializeCurrentThreadInternal(const char* szThreadName)
{
+#if COMPILER(MINGW)
+ // FIXME: Implement thread name setting with MingW.
+ UNUSED_PARAM(szThreadName);
+#else
THREADNAME_INFO info;
info.dwType = 0x1000;
info.szName = szThreadName;
@@ -138,6 +142,7 @@
RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), reinterpret_cast<ULONG_PTR*>(&info));
} __except (EXCEPTION_CONTINUE_EXECUTION) {
}
+#endif
}
static Mutex* atomicallyInitializedStaticMutex;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
