[前][次][番号順一覧][スレッド一覧]

ruby-changes:57214

From: nagachika <ko1@a...>
Date: Thu, 22 Aug 2019 20:40:06 +0900 (JST)
Subject: [ruby-changes:57214] nagachika: 0a74fac956 (ruby_2_6): merge revision(s) fd0e3bd2497d4e796b719c7b7154dc3c945f87b1: [Backport #14834]

https://git.ruby-lang.org/ruby.git/commit/?id=0a74fac956

From 0a74fac956d5bf5fdcd6d2b5ba80c564c2e942d9 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Aug 2019 11:39:49 +0000
Subject: merge revision(s) fd0e3bd2497d4e796b719c7b7154dc3c945f87b1: [Backport
 #14834]

	fix VC 2013 compile error

	It seems the compiler does not support VLAs.
	See also: https://ci.appveyor.com/project/ruby/ruby/builds/26392589/job/px6nuiuw4e78weg1

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

diff --git a/ext/-test-/bug-14834/bug-14384.c b/ext/-test-/bug-14834/bug-14384.c
index 58abd6d..0d4103b 100644
--- a/ext/-test-/bug-14834/bug-14384.c
+++ b/ext/-test-/bug-14834/bug-14384.c
@@ -28,8 +28,8 @@ g(MAYBE_UNUSED(VALUE q), void* w) https://github.com/ruby/ruby/blob/trunk/ext/-test-/bug-14834/bug-14384.c#L28
     const int *e = (const int *)w;
     const int  r = *e++;
     const int  t = *e++;
-    VALUE      y[t];
-    int        u[t];
+    VALUE     *y = ALLOCA_N(VALUE, t);
+    int       *u = ALLOCA_N(int, t);
 
     rb_profile_frames(r, t, y, u);
 }
diff --git a/version.h b/version.h
index 001618f..0b76ca4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 99
+#define RUBY_PATCHLEVEL 100
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 8
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]