merge revision(s) 50423: [Backport #11733]

	* ext/-test-/file/fs.c: need to include sys/statvfs.h
	  to use statvfs().

	* ext/-test-/file/extconf.rb: check the existence of
	  sys/statvfs.h


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

4 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 34258500f2..a8e6d340ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec  9 01:24:57 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* ext/-test-/file/fs.c: need to include sys/statvfs.h
+	  to use statvfs().
+
+	* ext/-test-/file/extconf.rb: check the existence of
+	  sys/statvfs.h
+
 Fri Dec  4 04:46:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): fix wrong shifting position in
diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb
index be4a2fbdeb..87a2f4a205 100644
--- a/ext/-test-/file/extconf.rb
+++ b/ext/-test-/file/extconf.rb
@@ -6,7 +6,7 @@ if have_type("struct statfs", headers)
   have_struct_member("struct statfs", "f_type", headers)
 end
 
-headers = %w[sys/statvfs.h]
+headers = %w[sys/statvfs.h].select {|h| have_header(h)}
 if have_type("struct statvfs", headers)
   have_struct_member("struct statvfs", "f_fstypename", headers)
   have_struct_member("struct statvfs", "f_basetype", headers)
diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c
index 1ab067e1b2..d93ce27945 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -7,6 +7,9 @@
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
 
 #if defined HAVE_STRUCT_STATFS_F_FSTYPENAME
 typedef struct statfs statfs_t;
diff --git a/version.h b/version.h
index 4e798cc525..88c6688f9a 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-12-04"
-#define RUBY_PATCHLEVEL 220
+#define RUBY_RELEASE_DATE "2015-12-09"
+#define RUBY_PATCHLEVEL 221
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 9
 
 #include "ruby/version.h"