ruby-changes:74156
From: nagachika <ko1@a...>
Date: Fri, 21 Oct 2022 14:02:44 +0900 (JST)
Subject: [ruby-changes:74156] 1ccdd9ee57 (ruby_3_1): merge revision(s) bdb7345ce96c641796909abc2dbdac0d4400ca41:
https://git.ruby-lang.org/ruby.git/commit/?id=1ccdd9ee57 From 1ccdd9ee5773b34867fce8c3796e046ee6b2b9f5 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Fri, 21 Oct 2022 13:41:00 +0900 Subject: merge revision(s) bdb7345ce96c641796909abc2dbdac0d4400ca41: Use compiled instead of complied Capitalize creates --- lib/mkmf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- lib/mkmf.rb | 4 ++-- version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ff854b3c30..32829e42fc 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -67,7 +67,7 @@ module MakeMakefile https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L67 C_EXT = %w[c m] ## - # Extensions for files complied with a C++ compiler + # Extensions for files compiled with a C++ compiler CXX_EXT = %w[cc mm cxx cpp] unless File.exist?(File.join(*File.split(__FILE__).tap {|d, b| b.swapcase})) @@ -2114,7 +2114,7 @@ preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''} https://github.com/ruby/ruby/blob/trunk/lib/mkmf.rb#L2114 end # :startdoc: - # creates a stub Makefile. + # Creates a stub Makefile. # def dummy_makefile(srcdir) configuration(srcdir) << <<RULES << CLEANINGS diff --git a/version.h b/version.h index 44e0002976..28259f7b3d 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 128 +#define RUBY_PATCHLEVEL 129 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 -- cgit v1.2.3 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/