merge revision(s) 39781,39783: [Backport #8080]

	missing.h: build fix

	* include/ruby/missing.h: include time.h and sys/time.h iff needed,
  but excepct for sys/time.h on linux to get rid of glibc bug.
	* include/ruby/missing.h: removed __linux__. it's unnecessary.


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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 50450facc1..2603b6c384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 20 23:08:40 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* include/ruby/missing.h: removed __linux__. it's unnecessary.
+
 Wed Mar 20 23:03:27 2013  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in: move OS specific header/function knowledge before
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index fc333e1a47..9b502cd3d8 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -25,12 +25,14 @@ extern "C" {
 #include RUBY_EXTCONF_H
 #endif
 
+#if !defined(HAVE_STRUCT_TIMEVAL) || !defined(HAVE_STRUCT_TIMESPEC)
 #if defined(HAVE_TIME_H)
 # include <time.h>
 #endif
 #if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
 #endif
+#endif
 
 #if !defined(HAVE_STRUCT_TIMEVAL)
 struct timeval {
diff --git a/version.h b/version.h
index e56266f369..5f537f15b2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 83
+#define RUBY_PATCHLEVEL 84
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3