aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 15:19:38 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-19 15:19:38 +0000
commitaf94c81302cd778d5e62ddae714e52c891f69d38 (patch)
treefe27bc8cf8fda308dbc17a9cc8e5faa0704ff4a2
parent8d4f4e25e5d4bdaf70e84e1615e6db227c1a96b4 (diff)
downloadruby-af94c81302cd778d5e62ddae714e52c891f69d38.tar.gz
* thread_win32.c (native_sleep): fix to decrement sleeper count.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread_win32.c2
-rw-r--r--version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 34ed8fb41b..1001b475ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 00:18:04 2008 Koichi Sasada <ko1@atdot.net>
+
+ * thread_win32.c (native_sleep): fix to decrement sleeper count.
+
Thu Jun 19 23:48:45 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/net/http/test_http.rb: compare encodings of two strings before
diff --git a/thread_win32.c b/thread_win32.c
index fb9b680b00..993f5f271d 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -246,7 +246,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable)
}
GVL_UNLOCK_END();
th->status = prev_status;
- if (!tv && deadlockable) th->vm->sleeper++;
+ if (!tv && deadlockable) th->vm->sleeper--;
RUBY_VM_CHECK_INTS();
}
diff --git a/version.h b/version.h
index 3ceb512c77..8409592edf 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-19"
+#define RUBY_RELEASE_DATE "2008-06-20"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080619
+#define RUBY_RELEASE_CODE 20080620
#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 6
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];