Title: [95110] trunk/Source/_javascript_Core
- Revision
- 95110
- Author
- [email protected]
- Date
- 2011-09-14 12:10:04 -0700 (Wed, 14 Sep 2011)
Log Message
[Qt] Win32 builds with threads turned off
https://bugs.webkit.org/show_bug.cgi?id=67864
Reviewed by Geoffrey Garen.
* _javascript_Core.pri: Link pthread library on Windows platform.
* wtf/Platform.h: Enable multiple threads.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (95109 => 95110)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-14 19:00:50 UTC (rev 95109)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-14 19:10:04 UTC (rev 95110)
@@ -1,3 +1,13 @@
+2011-09-14 Csaba Osztrogonác <[email protected]>
+
+ [Qt] Win32 builds with threads turned off
+ https://bugs.webkit.org/show_bug.cgi?id=67864
+
+ Reviewed by Geoffrey Garen.
+
+ * _javascript_Core.pri: Link pthread library on Windows platform.
+ * wtf/Platform.h: Enable multiple threads.
+
2011-09-14 Mark Hahnenberg <[email protected]>
Unzip initialization lists and constructors in JSCell hierarchy (6/7)
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (95109 => 95110)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2011-09-14 19:00:50 UTC (rev 95109)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2011-09-14 19:10:04 UTC (rev 95110)
@@ -51,6 +51,12 @@
INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
}
+win32-g++* {
+ LIBS += -lpthreadGC2
+} else:win32-msvc* {
+ LIBS += -lpthreadVC2
+}
+
win32-*: DEFINES += _HAS_TR1=0
DEFINES += BUILDING_JavaScriptCore BUILDING_WTF
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (95109 => 95110)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-14 19:00:50 UTC (rev 95109)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-09-14 19:10:04 UTC (rev 95110)
@@ -509,21 +509,13 @@
#define WTF_USE_PTHREAD_BASED_QT 1
#endif
-/* FIXME: JSC multithreading currently only supports pthread.
- Qt-Win cannot do multithreading because it is not pthread-based. */
#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
-#if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
#define ENABLE_JSC_MULTIPLE_THREADS 1
#endif
-#endif
-/* FIXME: JSC multithreading currently only supports pthread.
- Qt-Win cannot do multithreading because it is not pthread-based. */
#if !defined(ENABLE_WTF_MULTIPLE_THREADS)
-#if !PLATFORM(QT) || USE(PTHREAD_BASED_QT)
#define ENABLE_WTF_MULTIPLE_THREADS 1
#endif
-#endif
/* On Windows, use QueryPerformanceCounter by default */
#if OS(WINDOWS)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
