[前][次][番号順一覧][スレッド一覧]

ruby-changes:17317

From: wanabe <ko1@a...>
Date: Thu, 23 Sep 2010 19:32:15 +0900 (JST)
Subject: [ruby-changes:17317] Ruby:r29321 (trunk): * thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.

wanabe	2010-09-23 19:29:27 +0900 (Thu, 23 Sep 2010)

  New Revision: 29321

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29321

  Log:
    * thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
      see [ruby-core:31932].

  Modified files:
    trunk/ChangeLog
    trunk/thread_win32.c

Index: thread_win32.c
===================================================================
--- thread_win32.c	(revision 29320)
+++ thread_win32.c	(revision 29321)
@@ -123,10 +123,10 @@
     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 @@
 static void
 w32_resume_thread(HANDLE handle)
 {
-    if (ResumeThread(handle) == -1) {
+    if (ResumeThread(handle) == (DWORD)-1) {
 	w32_error("w32_resume_thread");
     }
 }
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29320)
+++ ChangeLog	(revision 29321)
@@ -1,3 +1,8 @@
+Thu Sep 23 19:27:57 2010  wanabe  <s.wanabe@g...>
+
+	* 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@g...>
 
 	* tool/config.sub: add mingw64.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]