summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 33b2a40d20..7ab1878fc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 22 13:06:14 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
+ merge from HEAD.
+
Wed Sep 22 00:11:12 2004 Dave Thomas <dave@pragprog.com>
* process.c: Add documentation for fork()
diff --git a/win32/win32.c b/win32/win32.c
index 50753fcf9a..86a791da08 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2879,7 +2879,7 @@ static void rb_w32_call_handler(struct handler_arg_t* h)
rb_jump_tag(status);
}
h->finished = 1;
- Sleep(INFINITE); /* safe on Win95? */
+ yield_until(0);
}
static struct handler_arg_t* setup_handler(struct handler_arg_t *harg,