summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--version.h2
-rw-r--r--vm_exec.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e2db55869a..ebc04d5fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 27 03:02:30 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.
+
Wed Mar 27 02:58:44 2013 NARUSE, Yui <naruse@ruby-lang.org>
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
diff --git a/version.h b/version.h
index 981df2d26c..e9b065d33a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-27"
-#define RUBY_PATCHLEVEL 99
+#define RUBY_PATCHLEVEL 100
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3
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__)