ruby-changes:28372
From: nagachika <ko1@a...>
Date: Tue, 23 Apr 2013 22:25:16 +0900 (JST)
Subject: [ruby-changes:28372] nagachika:r40424 (ruby_2_0_0): merge revision(s) 40411:
nagachika 2013-04-23 22:25:06 +0900 (Tue, 23 Apr 2013) New Revision: 40424 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40424 Log: merge revision(s) 40411: fix minor code comment typos Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/version.h branches/ruby_2_0_0/vm_exec.h branches/ruby_2_0_0/vm_opts.h Index: ruby_2_0_0/vm_exec.h =================================================================== --- ruby_2_0_0/vm_exec.h (revision 40423) +++ ruby_2_0_0/vm_exec.h (revision 40424) @@ -83,7 +83,7 @@ error ! https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_exec.h#L83 LABEL(insn): \ INSN_ENTRY_SIG(insn); \ -/* dispather */ +/* dispatcher */ #if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) && __GNUC__ == 3 #define DISPATCH_ARCH_DEPEND_WAY(addr) \ asm volatile("jmp *%0;\t# -- inseted by vm.h\t[length = 2]" : : "r" (addr)) @@ -105,7 +105,7 @@ error ! https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_exec.h#L105 ; #else -/* token threade code */ +/* token threaded code */ #define TC_DISPATCH(insn) \ DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \ Index: ruby_2_0_0/vm_opts.h =================================================================== --- ruby_2_0_0/vm_opts.h (revision 40423) +++ ruby_2_0_0/vm_opts.h (revision 40424) @@ -29,7 +29,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_opts.h#L29 * You can't change these options at runtime. */ -/* C compiler depend */ +/* C compiler dependent */ #define OPT_DIRECT_THREADED_CODE 1 #define OPT_TOKEN_THREADED_CODE 0 #define OPT_CALL_THREADED_CODE 0 Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 40423) +++ ruby_2_0_0/version.h (revision 40424) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-23" -#define RUBY_PATCHLEVEL 159 +#define RUBY_PATCHLEVEL 160 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40411 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/