nagachika	2013-03-27 03:02:50 +0900 (Wed, 27 Mar 2013)

  New Revision: 39954

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39954

  Log:
    merge revision(s) 39806: [Backport #8118]
    
    * vm_exec.c: Correct predefined macro name. This typo is introduced by
      r36534 and should be backported to ruby_2_0_0.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/vm_exec.c

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39953)
+++ ruby_2_0_0/ChangeLog	(revision 39954)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 27 03:02:30 2013  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
Index: ruby_2_0_0/vm_exec.c
===================================================================
--- ruby_2_0_0/vm_exec.c	(revision 39953)
+++ ruby_2_0_0/vm_exec.c	(revision 39954)
@@ -18,7 +18,7 @@ static void vm_analysis_insn(int insn); https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/vm_exec.c#L18
 #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__)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39953)
+++ ruby_2_0_0/version.h	(revision 39954)
@@ -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-03-27"
-#define RUBY_PATCHLEVEL 99
+#define RUBY_PATCHLEVEL 100
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39806


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/