naruse	2016-04-18 17:26:01 +0900 (Mon, 18 Apr 2016)

  New Revision: 54634

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54634

  Log:
    merge revision(s) 54574: [Backport #12279]
    
    * cont.c (fiber_initialize_machine_stack_context): fix wrong
      _MSC_VER check, should be decimal but not hexadecimal.
      [ruby-core:74936] [Bug #12279]
    
    * cont.c (fiber_initialize_machine_stack_context): fix wrong
      _MSC_VER check, should be decimal but not hexadecimal.
      [ruby-core:74936] [Bug #12279]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/cont.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54633)
+++ ruby_2_3/version.h	(revision 54634)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-18"
-#define RUBY_PATCHLEVEL 89
+#define RUBY_PATCHLEVEL 90
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_3/cont.c
===================================================================
--- ruby_2_3/cont.c	(revision 54633)
+++ ruby_2_3/cont.c	(revision 54634)
@@ -657,7 +657,7 @@ fiber_initialize_machine_stack_context(r https://github.com/ruby/ruby/blob/trunk/ruby_2_3/cont.c#L657
     rb_thread_t *sth = &fib->cont.saved_thread;
 
 #ifdef _WIN32
-# if defined(_MSC_VER) && _MSC_VER <= 0x1200
+# if defined(_MSC_VER) && _MSC_VER <= 1200
 #   define CreateFiberEx(cs, stacksize, flags, entry, param) \
     CreateFiber((stacksize), (entry), (param))
 # endif
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54633)
+++ ruby_2_3/ChangeLog	(revision 54634)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Mon Apr 18 17:18:25 2016  cremno phobia  <cremno@m...>
+
+	* cont.c (fiber_initialize_machine_stack_context): fix wrong
+	  _MSC_VER check, should be decimal but not hexadecimal.
+	  [ruby-core:74936] [Bug #12279]
+
+Mon Apr 18 17:18:25 2016  cremno phobia  <cremno@m...>
+
+	* cont.c (fiber_initialize_machine_stack_context): fix wrong
+	  _MSC_VER check, should be decimal but not hexadecimal.
+	  [ruby-core:74936] [Bug #12279]
+
 Mon Apr 18 17:08:10 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_vm_struct): make at_exit a single linked list but

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54574


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