nagachika	2013-03-20 23:10:09 +0900 (Wed, 20 Mar 2013)

  New Revision: 39850

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/include/ruby/missing.h
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/include/ruby/missing.h
===================================================================
--- ruby_2_0_0/include/ruby/missing.h	(revision 39849)
+++ ruby_2_0_0/include/ruby/missing.h	(revision 39850)
@@ -25,12 +25,14 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/missing.h#L25
 #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 {
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39849)
+++ ruby_2_0_0/ChangeLog	(revision 39850)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 20 23:08:40 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* include/ruby/missing.h: removed __linux__. it's unnecessary.
+
 Wed Mar 20 23:03:27 2013  Tanaka Akira  <akr@f...>
 
 	* configure.in: move OS specific header/function knowledge before
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39849)
+++ ruby_2_0_0/version.h	(revision 39850)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39781,39783


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