Changeset 94927 in webkit

Timestamp:

Sep 11, 2011 11:34:02 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt] Win32 build broken due to MachineStackMarker.cpp/.o failing to link against pthreads library
​https://bugs.webkit.org/show_bug.cgi?id=67864

Qt Win32 is not pthread compatible and cannot participate in multithreaded JSC or it fails to build.

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-11
Reviewed by Csaba Osztrogonác.

• wtf/Platform.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-11  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt] Win32 build broken due to MachineStackMarker.cpp/.o failing to link against pthreads library
+        https://bugs.webkit.org/show_bug.cgi?id=67864
+        
+        Qt Win32 is not pthread compatible and cannot participate in multithreaded JSC or it fails to build.
+
+        Reviewed by Csaba Osztrogonác.
+
+        * wtf/Platform.h:
+
 2011-09-11  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -510 +510 @@
 #endif
 
-#if !defined(ENABLE_JSC_MULTIPLE_THREADS)
+/* FIXME: JSC multithreading currently only supports pthread.
+   Qt-Win cannot do multithreading because it is not pthread-based. */
+#if !defined(ENABLE_JSC_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
 #define ENABLE_JSC_MULTIPLE_THREADS 1
 #endif
 
-#if !defined(ENABLE_WTF_MULTIPLE_THREADS)
+/* FIXME: JSC multithreading currently only supports pthread.
+   Qt-Win cannot do multithreading because it is not pthread-based. */
+#if !defined(ENABLE_WTF_MULTIPLE_THREADS) && (!PLATFORM(QT) || USE(PTHREAD_BASED_QT))
 #define ENABLE_WTF_MULTIPLE_THREADS 1
 #endif