summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-16 15:58:25 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-16 15:58:25 +0000
commit28d3acb045cc1f5dec7fbaf9f71ac1ee1256e7d8 (patch)
tree358a3c69a97de029bd0a4905911a29314d5fab16
parent6b83f5e6a552c6856cc0b61796ef94d1e0b541ef (diff)
* include/ruby/missing.h: removed __linux__. it's unnecessary.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--include/ruby/missing.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 18f7b5c39a..ae1730a48d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 17 00:55:31 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * include/ruby/missing.h: removed __linux__. it's unnecessary.
+
Fri Mar 15 14:57:16 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug.
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index cf97ca2133..9b502cd3d8 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -29,7 +29,7 @@ extern "C" {
#if defined(HAVE_TIME_H)
# include <time.h>
#endif
-#if defined(HAVE_SYS_TIME_H) && !defined(__linux__)
+#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#endif
#endif