Title: [113657] trunk/Source/WTF
- Revision
- 113657
- Author
- [email protected]
- Date
- 2012-04-09 18:53:54 -0700 (Mon, 09 Apr 2012)
Log Message
Port BinarySemaphoreWin.cpp to WinCE
https://bugs.webkit.org/show_bug.cgi?id=83502
Reviewed by Daniel Bates.
Replace WaitForSingleObjectEx with WaitForSingleObject since
the additonal parameter supported by the extended function
is not used anyway and the function does not exist on WinCE.
* wtf/CMakeLists.txt:
* wtf/PlatformWinCE.cmake:
* wtf/threads/win/BinarySemaphoreWin.cpp:
(WTF::BinarySemaphore::wait):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (113656 => 113657)
--- trunk/Source/WTF/ChangeLog 2012-04-10 01:46:40 UTC (rev 113656)
+++ trunk/Source/WTF/ChangeLog 2012-04-10 01:53:54 UTC (rev 113657)
@@ -1,5 +1,21 @@
2012-04-09 Patrick Gansterer <[email protected]>
+ Port BinarySemaphoreWin.cpp to WinCE
+ https://bugs.webkit.org/show_bug.cgi?id=83502
+
+ Reviewed by Daniel Bates.
+
+ Replace WaitForSingleObjectEx with WaitForSingleObject since
+ the additonal parameter supported by the extended function
+ is not used anyway and the function does not exist on WinCE.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformWinCE.cmake:
+ * wtf/threads/win/BinarySemaphoreWin.cpp:
+ (WTF::BinarySemaphore::wait):
+
+2012-04-09 Patrick Gansterer <[email protected]>
+
[CMake] Build fix for USE_SYSTEM_MALLOC after r113570.
* wtf/CMakeLists.txt:
Modified: trunk/Source/WTF/wtf/CMakeLists.txt (113656 => 113657)
--- trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-10 01:46:40 UTC (rev 113656)
+++ trunk/Source/WTF/wtf/CMakeLists.txt 2012-04-10 01:53:54 UTC (rev 113657)
@@ -187,8 +187,9 @@
SET(WTF_INCLUDE_DIRECTORIES
"${WTF_DIR}"
"${WTF_DIR}/wtf"
+ "${WTF_DIR}/wtf/dtoa"
+ "${WTF_DIR}/wtf/threads"
"${WTF_DIR}/wtf/unicode"
- "${WTF_DIR}/wtf/dtoa"
"${THIRDPARTY_DIR}"
"${CMAKE_BINARY_DIR}"
)
Modified: trunk/Source/WTF/wtf/PlatformWinCE.cmake (113656 => 113657)
--- trunk/Source/WTF/wtf/PlatformWinCE.cmake 2012-04-10 01:46:40 UTC (rev 113656)
+++ trunk/Source/WTF/wtf/PlatformWinCE.cmake 2012-04-10 01:53:54 UTC (rev 113657)
@@ -11,6 +11,8 @@
ThreadingWin.cpp
ThreadSpecificWin.cpp
+ threads/win/BinarySemaphoreWin.cpp
+
unicode/CollatorDefault.cpp
unicode/wince/UnicodeWinCE.cpp
Modified: trunk/Source/WTF/wtf/threads/win/BinarySemaphoreWin.cpp (113656 => 113657)
--- trunk/Source/WTF/wtf/threads/win/BinarySemaphoreWin.cpp 2012-04-10 01:46:40 UTC (rev 113656)
+++ trunk/Source/WTF/wtf/threads/win/BinarySemaphoreWin.cpp 2012-04-10 01:53:54 UTC (rev 113657)
@@ -52,7 +52,7 @@
return false;
}
- DWORD result = ::WaitForSingleObjectEx(m_event, interval, FALSE);
+ DWORD result = ::WaitForSingleObject(m_event, interval);
switch (result) {
case WAIT_OBJECT_0:
// The event was signaled.
@@ -63,10 +63,11 @@
return false;
case WAIT_FAILED:
- ASSERT_WITH_MESSAGE(false, "::WaitForSingleObjectEx failed with error %lu", ::GetLastError());
+ ASSERT_WITH_MESSAGE(false, "::WaitForSingleObject failed with error %lu", ::GetLastError());
return false;
+
default:
- ASSERT_WITH_MESSAGE(false, "::WaitForSingleObjectEx returned unexpected result %lu", result);
+ ASSERT_WITH_MESSAGE(false, "::WaitForSingleObject returned unexpected result %lu", result);
return false;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
