summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-08 15:27:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-08 15:27:48 +0000
commit6aa05eba8a13e92338a7c6cd531107bc11132f19 (patch)
tree312509e17280a113419fcba84d8d5c415322099b
parent9f7feadf03dde2618693ea1d25975511843376a4 (diff)
* thread.c (rb_thread_aset): fixed argument type.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c2
-rw-r--r--version.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f0f5fd8798..1b4dd8f2c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 9 00:27:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_aset): fixed argument type.
+
Sat May 8 23:09:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* NEWS (io/console): IO#noecho and IO#raw without block are
diff --git a/thread.c b/thread.c
index 668e698cea..8fc02ec534 100644
--- a/thread.c
+++ b/thread.c
@@ -2052,7 +2052,7 @@ rb_thread_local_aset(VALUE thread, ID id, VALUE val)
*/
static VALUE
-rb_thread_aset(VALUE self, ID id, VALUE val)
+rb_thread_aset(VALUE self, VALUE id, VALUE val)
{
return rb_thread_local_aset(self, rb_to_id(id), val);
}
diff --git a/version.h b/version.h
index d3edc1f76a..0aa57afb1e 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-05-08"
+#define RUBY_RELEASE_DATE "2010-05-09"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
#include "ruby/version.h"