aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-18 01:45:12 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-18 01:45:12 +0000
commit9b113a0d6bec8e61e72171d98843b4d58f8dbf53 (patch)
tree1d1577debef2ee983cfba73da8a706a7a517a6a3
parentd883d756d109d6d54201311fb0de85ee4967db3b (diff)
downloadruby-9b113a0d6bec8e61e72171d98843b4d58f8dbf53.tar.gz
* vm_exec.c: Correct predefined macro name. This typo is introduced by
r36534 and should be backported to ruby_2_0_0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_exec.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf91651562..71a8ed5a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 18 10:41:06 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * vm_exec.c: Correct predefined macro name. This typo is introduced by
+ r36534 and should be backported to ruby_2_0_0.
+
Mon Mar 18 03:18:00 2013 Zachary Scott <zachary@zacharyscott.net>
* array.c: Typo in Array#delete by Timo Sand [GH fixes #258]
diff --git a/vm_exec.c b/vm_exec.c
index 489181cdff..c914a8bcca 100644
--- a/vm_exec.c
+++ b/vm_exec.c
@@ -18,7 +18,7 @@ static void vm_analysis_insn(int insn);
#if VMDEBUG > 0
#define DECL_SC_REG(type, r, reg) register type reg_##r
-#elif defined(__GNUC__) && defined(_x86_64__)
+#elif defined(__GNUC__) && defined(__x86_64__)
#define DECL_SC_REG(type, r, reg) register type reg_##r __asm__("r" reg)
#elif defined(__GNUC__) && defined(__i386__)