summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-23 13:25:06 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-23 13:25:06 +0000
commit71fba6871fb1f5676c790424812f4a4b8fe1cbc3 (patch)
treea8ed671ebb95514daa2b4d79afe7ce6b71ea22a4
parent7194acb65d91b866a90cc6e919cc136b84f17a13 (diff)
merge revision(s) 40411:
fix minor code comment typos git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--version.h2
-rw-r--r--vm_exec.h4
-rw-r--r--vm_opts.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/version.h b/version.h
index 31fc3c0e60..737a456b65 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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
diff --git a/vm_exec.h b/vm_exec.h
index 1c77f3746a..b209495ab9 100644
--- a/vm_exec.h
+++ b/vm_exec.h
@@ -83,7 +83,7 @@ error !
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 !
;
#else
-/* token threade code */
+/* token threaded code */
#define TC_DISPATCH(insn) \
DISPATCH_ARCH_DEPEND_WAY(insns_address_table[GET_CURRENT_INSN()]); \
diff --git a/vm_opts.h b/vm_opts.h
index b5c91ea809..b67e2543e7 100644
--- a/vm_opts.h
+++ b/vm_opts.h
@@ -29,7 +29,7 @@
* 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