aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 16:39:15 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-11 16:39:15 +0000
commit8980a9b47bcb3690d646e189c98b16bc7a6a7733 (patch)
treefacb365ea6d6d2296838bc7bc09789617779c00d
parent23abeeb769c702386ead983328e79fb3b759a712 (diff)
downloadruby-8980a9b47bcb3690d646e189c98b16bc7a6a7733.tar.gz
* file.c: include sys/time.h only if HAVE_SYS_TIME_H
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 26b1d82514..56393f57e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 12 01:37:11 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
+
+ * file.c: include sys/time.h only if HAVE_SYS_TIME_H
+
Sat Oct 11 22:29:40 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
* file.c (HAVE_UTIMENSAT): disabled for NativeClient.
diff --git a/file.c b/file.c
index a1ad4c3dd6..c3ed3b524b 100644
--- a/file.c
+++ b/file.c
@@ -32,7 +32,9 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <sys/time.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>