summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 15:15:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 15:15:40 +0000
commit4bfb24fe8f79ab1ddf71e9ba271e80fa4e66e303 (patch)
tree0587b227cd7d9c39b94ba745dbc4939002ca55f6
parent215a7a8003bd292ad6bb23e141aa187919f1e9ed (diff)
downloadruby-4bfb24fe8f79ab1ddf71e9ba271e80fa4e66e303.tar.gz
ruby-4bfb24fe8f79ab1ddf71e9ba271e80fa4e66e303.tar.xz
ruby-4bfb24fe8f79ab1ddf71e9ba271e80fa4e66e303.zip
* thread_win32.c (w32_wait_events): shouldn't invoke interrupt handle
by timer_thread. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_win32.c2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a3fcee5a7..d09ae65be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 19 00:13:19 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (w32_wait_events): shouldn't invoke interrupt handle
+ by timer_thread.
+
Fri Jan 18 23:49:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (thread_create_core): set thread group before creating
diff --git a/thread_win32.c b/thread_win32.c
index 7680a226e..ba40d7fe7 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -103,7 +103,7 @@ w32_wait_events(HANDLE *events, int count, DWORD timeout, rb_thread_t *th)
events, count, timeout, th);
if (th && (intr = th->native_thread_data.interrupt_event)) {
w32_reset_event(intr);
- if (th->interrupt_flag) {
+ if (RUBY_VM_INTERRUPTED(th)) {
w32_set_event(intr);
}
diff --git a/version.h b/version.h
index e55ff401c..e3c12d711 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-01-18"
+#define RUBY_RELEASE_DATE "2008-01-19"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080118
+#define RUBY_RELEASE_CODE 20080119
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];