summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread_win32.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d661b1f453..56526affe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 23 19:27:57 2010 wanabe <s.wanabe@gmail.com>
+
+ * thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
+ see [ruby-core:31932].
+
Thu Sep 23 18:54:39 2010 wanabe <s.wanabe@gmail.com>
* tool/config.sub: add mingw64.
diff --git a/thread_win32.c b/thread_win32.c
index 894fad92fc..9e64ea4347 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -123,10 +123,10 @@ w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th)
ret = WaitForMultipleObjects(count, targets, FALSE, timeout);
thread_debug(" WaitForMultipleObjects end (ret: %lu)\n", ret);
- if (ret == WAIT_OBJECT_0 + count - 1 && th) {
+ if (ret == (DWORD)(WAIT_OBJECT_0 + count - 1) && th) {
errno = EINTR;
}
- if (ret == -1 && THREAD_DEBUG) {
+ if (ret == WAIT_FAILED && THREAD_DEBUG) {
int i;
DWORD dmy;
for (i = 0; i < count; i++) {
@@ -167,7 +167,7 @@ w32_close_handle(HANDLE handle)
static void
w32_resume_thread(HANDLE handle)
{
- if (ResumeThread(handle) == -1) {
+ if (ResumeThread(handle) == (DWORD)-1) {
w32_error("w32_resume_thread");
}
}