nagachika	2015-12-09 01:25:41 +0900 (Wed, 09 Dec 2015)

  New Revision: 52973

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

  Log:
    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

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/-test-/file/extconf.rb
    branches/ruby_2_2/ext/-test-/file/fs.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52972)
+++ ruby_2_2/ChangeLog	(revision 52973)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Dec  9 01:24:57 2015  Rei Odaira  <Rei.Odaira@g...>
+
+	* 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@r...>
 
 	* sprintf.c (rb_str_format): fix wrong shifting position in
Index: ruby_2_2/ext/-test-/file/extconf.rb
===================================================================
--- ruby_2_2/ext/-test-/file/extconf.rb	(revision 52972)
+++ ruby_2_2/ext/-test-/file/extconf.rb	(revision 52973)
@@ -6,7 +6,7 @@ if have_type("struct statfs", headers) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/file/extconf.rb#L6
   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)
Index: ruby_2_2/ext/-test-/file/fs.c
===================================================================
--- ruby_2_2/ext/-test-/file/fs.c	(revision 52972)
+++ ruby_2_2/ext/-test-/file/fs.c	(revision 52973)
@@ -7,6 +7,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/file/fs.c#L7
 #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;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52972)
+++ ruby_2_2/version.h	(revision 52973)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50423


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