2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c41f0f4038..4142229875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon May 10 14:13:04 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (rb_big_abs_find_minbit): get rid of a warning of VC.
+
+Mon May 10 13:59:42 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_has_cancel_io): new
+	  function.
+
+	* io.c (WAIT_FD_IN_WIN32): check only when it's not cancelable.
+
 Mon May 10 06:59:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* common.mk (rdoc): rdoc should depend main. Moreover when XRUBY
diff --git a/time.c b/time.c
index 62e4235603..1b461bbb34 100644
--- a/time.c
+++ b/time.c
@@ -345,7 +345,7 @@ rb_big_abs_find_minbit(VALUE big)
         return Qnil;
     res = mul(LONG2NUM(i), INT2FIX(SIZEOF_BDIGITS * CHAR_BIT));
     d = ds[i];
-    res = add(res, LONG2FIX(bdigit_find_maxbit(d & -d)));
+    res = add(res, LONG2FIX(bdigit_find_maxbit(d & (~d+1))));
     return res;
 }