merge revision(s) 53868: [Backport #12071]

	* ext/extmk.rb: add cygwin case, nothing excluded.
	  [ruby-core:73806] [Bug#12071]


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

3 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b2a0507250..817a292eb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 29 23:36:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: add cygwin case, nothing excluded.
+	  [ruby-core:73806] [Bug#12071]
+
 Tue Mar 29 23:10:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 737e5bfdd4..f2c914f4a9 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -494,7 +494,10 @@ end unless $extstatic
 ext_prefix = "#{$top_srcdir}/ext"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
 default_exclude_exts =
-  if $mswin or $mingw
+  case
+  when $cygwin
+    %w''
+  when $mswin, $mingw
     %w'pty syslog'
   else
     %w'*win32*'
diff --git a/version.h b/version.h
index 695edf65cb..be5e30ddf0 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3