ruby-changes:42690
From: nagachika <ko1@a...>
Date: Tue, 26 Apr 2016 01:57:13 +0900 (JST)
Subject: [ruby-changes:42690] nagachika:r54764 (ruby_2_3): merge revision(s) 54758:
nagachika 2016-04-26 02:53:49 +0900 (Tue, 26 Apr 2016) New Revision: 54764 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54764 Log: merge revision(s) 54758: sizes.c.tmpl: extra semicolon * template/sizes.c.tmpl (DEFINE): remove extra semicolon. Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/template/sizes.c.tmpl branches/ruby_2_3/version.h Index: ruby_2_3/template/sizes.c.tmpl =================================================================== --- ruby_2_3/template/sizes.c.tmpl (revision 54763) +++ ruby_2_3/template/sizes.c.tmpl (revision 54764) @@ -19,7 +19,7 @@ Init_sizeof(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/template/sizes.c.tmpl#L19 VALUE s = rb_hash_new(); rb_define_const(rb_define_module("RbConfig"), "SIZEOF", s); -#define DEFINE(type, size) rb_hash_aset(s, rb_str_new_cstr(#type), INT2FIX(SIZEOF_##size)); +#define DEFINE(type, size) rb_hash_aset(s, rb_str_new_cstr(#type), INT2FIX(SIZEOF_##size)) % types.each do |type| % cond = conditions[type] Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 54763) +++ ruby_2_3/version.h (revision 54764) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.0" -#define RUBY_RELEASE_DATE "2016-04-25" -#define RUBY_PATCHLEVEL 108 +#define RUBY_RELEASE_DATE "2016-04-26" +#define RUBY_PATCHLEVEL 109 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r54758 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/