summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-12 14:45:27 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-12 14:45:27 +0000
commit64f82e294aa003188b675e8ee6b2f3ba3a015813 (patch)
tree0ba9f2dc7dceeaea03a03c502486ee7f3cf91883
parent149e1593e92eb3d11a1f53cc524eafaf94fcb50c (diff)
merges r23911 from trunk into ruby_1_9_1.
-- * tool/compile_prelude.rb: use US-ASCII name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--tool/compile_prelude.rb4
-rw-r--r--version.h2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 39a2e4f9cf..960f0e097a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun 30 16:48:49 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/compile_prelude.rb: use US-ASCII name.
+
Tue Jun 30 11:05:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (dln_find_1): fixed index overrun.
diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb
index 72cf961bd8..e0a011ce2d 100644
--- a/tool/compile_prelude.rb
+++ b/tool/compile_prelude.rb
@@ -77,8 +77,8 @@ Init_<%=init_name%>(void)
{
% lines_list.each_with_index {|(setup_lines, lines), i|
rb_iseq_eval(rb_iseq_compile(
- rb_str_new(prelude_code<%=i%>, sizeof(prelude_code<%=i%>) - 1),
- rb_str_new(prelude_name<%=i%>, sizeof(prelude_name<%=i%>) - 1),
+ rb_usascii_str_new(prelude_code<%=i%>, sizeof(prelude_code<%=i%>) - 1),
+ rb_usascii_str_new(prelude_name<%=i%>, sizeof(prelude_name<%=i%>) - 1),
INT2FIX(<%=1-setup_lines.length%>)));
% }
diff --git a/version.h b/version.h
index 88a320b2d8..bf725a1986 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1