aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/-test-/file/extconf.rb2
-rw-r--r--ext/-test-/file/fs.c3
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e409d8176b..d348fe2197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 3 22:40:06 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
+
Sun May 3 21:59:48 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/yaml.rb: fix typo. [ci skip][fix GH-890]
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 f0be84ad3b..d3fa5350e5 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -10,6 +10,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;