Changeset 37364 in webkit for trunk/JavaScriptCore/wtf/ThreadingWin.cpp

Timestamp:

Oct 6, 2008, 6:21:50 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-06 Tony Chang <​[email protected]>

Reviewed by Alexey Proskuryakov.

Chromium doesn't use pthreads on windows, so make its use conditional.

Also convert a WORD to a DWORD to avoid a compiler warning. This
matches the other methods around it.

• wtf/ThreadingWin.cpp: (WTF::wtfThreadEntryPoint): (WTF::ThreadCondition::broadcast):

File:

• trunk/JavaScriptCore/wtf/ThreadingWin.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -70 +70 @@
 #include <wtf/MathExtras.h>
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(PTHREADS)
 // Currently, Apple's Windows port uses a mixture of native and pthreads functions in FastMalloc.
 // To ensure that thread-specific data is properly destroyed, we need to end each thread with pthread_exit().
@@ -169 +169 @@
     void* result = invocation.function(invocation.data);
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) && USE(PTHREADS)
     // pthreads-win32 knows how to work with threads created with Win32 or CRT functions, so it's OK to mix APIs.
     pthread_exit(result);
@@ -430 +430 @@
     unsigned signals = 0;
 
-    WORD res = ::WaitForSingleObject(m_condition.m_mutex, INFINITE);
+    DWORD res = ::WaitForSingleObject(m_condition.m_mutex, INFINITE);
     ASSERT(res == WAIT_OBJECT_0);